设施的申请详情与申请成功的页面

packages/cpt_facility/lib/modules/booking/facility_booking_view_model.dart

@@ -149,7 +149,8 @@ class FacilityBookingViewModel extends _$FacilityBookingViewModel with DioCancel
     );
 
     if (result.isSuccess) {
-      FacilityDetailPage.startWithPop2Main();
+      final bookingId = result.data?.booking?.id;
+      FacilityDetailPage.startWithPop2Main(bookingId: bookingId);
     } else {
       ToastEngine.show(result.errorMsg ?? "UnKnow Error");
     }

packages/cpt_facility/lib/modules/booking/facility_booking_view_model.g.dart

@@ -7,7 +7,7 @@ part of 'facility_booking_view_model.dart';
 // **************************************************************************
 
 String _$facilityBookingViewModelHash() =>
-    r'5bfb55d67994d66800bb220385e48954d6aec449';
+    r'564f4a008b169156b09e3c2325eb1e1cd02e1a47';
 
 /// See also [FacilityBookingViewModel].
 @ProviderFor(FacilityBookingViewModel)

packages/cpt_facility/lib/modules/detail/facility_detail_page.dart

@@ -3,6 +3,7 @@ import 'package:cs_resources/generated/l10n.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:router/ext/auto_router_extensions.dart';
 import 'package:widgets/ext/ex_widget.dart';
@@ -14,21 +15,23 @@ import 'facility_detail_view_model.dart';
 
 @RoutePage()
 class FacilityDetailPage extends HookConsumerWidget {
-  const FacilityDetailPage({Key? key}) : super(key: key);
+  final String? bookingId;
+
+  const FacilityDetailPage({Key? key, required this.bookingId}) : super(key: key);
 
   //启动当前页面
-  static void startInstance({BuildContext? context}) {
+  static void startInstance({BuildContext? context, required String? bookingId}) {
     if (context != null) {
-      context.router.push(const FacilityDetailPageRoute());
+      context.router.push(FacilityDetailPageRoute(bookingId: bookingId));
     } else {
-      appRouter.push(const FacilityDetailPageRoute());
+      appRouter.push(FacilityDetailPageRoute(bookingId: bookingId));
     }
   }
 
   //启动当前页面并回退至设施首页
-  static void startWithPop2Main() {
+  static void startWithPop2Main({required String? bookingId}) {
     appRouter.pushAndPopUntil(
-      const FacilityDetailPageRoute(),
+      FacilityDetailPageRoute(bookingId: bookingId),
       predicate: (route) {
         return route.settings.name == 'FacilityPageRoute';
       },
@@ -40,8 +43,16 @@ class FacilityDetailPage extends HookConsumerWidget {
     final viewModel = ref.watch(facilityDetailViewModelProvider.notifier);
     final state = ref.watch(facilityDetailViewModelProvider);
 
+    useEffect(() {
+      // 组件挂载时执行 - 执行接口请求
+      Future.microtask(() => viewModel.fetchFacilityDetail(bookingId));
+      return () {
+        // 组件卸载时执行
+      };
+    }, []);
+
     return Scaffold(
-      appBar: MyAppBar.appBar(context, "Kids party room", backgroundColor: context.appColors.backgroundWhite),
+      appBar: MyAppBar.appBar(context, state.detail?.facility?.type?.name ?? "", backgroundColor: context.appColors.backgroundWhite),
       backgroundColor: context.appColors.backgroundDark,
       body: SingleChildScrollView(
         scrollDirection: Axis.vertical,
@@ -61,9 +72,9 @@ class FacilityDetailPage extends HookConsumerWidget {
               Assets.facilityConfirmDateIcon,
               28.5,
               29,
-              "Tue,24 Oct 2023",
+              state.detail?.booking?.date ?? "",
               null,
-              "05:00 PM-10:00 PM",
+              "${state.detail?.booking?.start ?? ""}-${state.detail?.booking?.end ?? ""}",
               null,
             ),
 
@@ -75,9 +86,9 @@ class FacilityDetailPage extends HookConsumerWidget {
               Assets.facilityConfirmFacilityIcon,
               25.0,
               30.5,
-              "Kids party room",
+              state.detail?.facility?.type?.name ?? "",
               null,
-              "Blue room",
+              state.detail?.facility?.name ?? "",
               null,
             ),
 
@@ -90,9 +101,9 @@ class FacilityDetailPage extends HookConsumerWidget {
               27.0,
               22.0,
               S.current.booking_fee,
-              "10.80",
+              state.detail?.timePeriod?.price ?? "",
               S.current.total,
-              "\$10.80",
+              "\$${state.detail?.timePeriod?.price ?? ""}",
             ),
 
             // 押金
@@ -104,7 +115,7 @@ class FacilityDetailPage extends HookConsumerWidget {
               28.0,
               26.5,
               S.current.on_hold,
-              "\$100.00",
+              "\$${state.detail?.timePeriod?.deposit ?? ""}",
               null,
               null,
             ),
@@ -115,6 +126,7 @@ class FacilityDetailPage extends HookConsumerWidget {
   }
 
   Widget _buildHeaderWidget(BuildContext context, WidgetRef ref) {
+    final state = ref.watch(facilityDetailViewModelProvider);
     return Container(
       width: double.infinity,
       color: context.appColors.whiteBG,
@@ -152,7 +164,7 @@ class FacilityDetailPage extends HookConsumerWidget {
             textColor: context.appColors.textBlack,
           ),
           MyTextView(
-            "\$10.80",
+            "\$${state.detail?.timePeriod?.price ?? ""}",
             fontSize: 15,
             isFontRegular: true,
             textColor: context.appColors.textPrimary,
@@ -187,7 +199,7 @@ class FacilityDetailPage extends HookConsumerWidget {
                 textColor: context.appColors.textBlack,
               ),
               MyTextView(
-                "24 Oct 2023 at 02:19 PM",
+                " ${state.detail?.booking?.date ?? ""}",
                 fontSize: 15,
                 isFontMedium: true,
                 textColor: context.appColors.textBlack,
@@ -195,21 +207,70 @@ class FacilityDetailPage extends HookConsumerWidget {
             ],
           ).marginOnly(top: 5),
 
-          Divider(height: 0.5, color: context.appColors.dividerDefault).marginOnly(top: 14, bottom: 14),
+          //退还押金的布局展示
+          Visibility(
+            visible: state.detail?.booking?.depositRefund != "0.00",
+            child: Column(
+              children: [
+                Divider(height: 0.5, color: context.appColors.dividerDefault).marginOnly(top: 14, bottom: 14),
 
-          //押金
-          MyTextView(
-            S.current.deposit_released_caps,
-            fontSize: 15,
-            isFontRegular: true,
-            textColor: context.appColors.textBlack,
-          ),
-          MyTextView(
-            "\$100.00",
-            fontSize: 15,
-            marginTop: 5,
-            isFontRegular: true,
-            textColor: context.appColors.textPrimary,
+                //退还的押金
+                MyTextView(
+                  S.current.deposit_released_caps,
+                  fontSize: 15,
+                  isFontRegular: true,
+                  textColor: context.appColors.textBlack,
+                ),
+
+                MyTextView(
+                  "\$${state.detail?.booking?.depositRefund ?? ""}",
+                  fontSize: 15,
+                  marginTop: 5,
+                  isFontRegular: true,
+                  textColor: context.appColors.textPrimary,
+                ),
+
+                Divider(height: 0.5, color: context.appColors.dividerDefault).marginOnly(top: 14, bottom: 14),
+
+                //押金付款于时间
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    MyTextView(
+                      S.current.hold_started_on,
+                      fontSize: 15,
+                      isFontRegular: true,
+                      textColor: context.appColors.textBlack,
+                    ),
+                    MyTextView(
+                      " ${state.detail?.booking?.date ?? ""}",
+                      fontSize: 15,
+                      isFontMedium: true,
+                      textColor: context.appColors.textBlack,
+                    ),
+                  ],
+                ).marginOnly(top: 5),
+
+                //押金退款于时间
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    MyTextView(
+                      S.current.released_on,
+                      fontSize: 15,
+                      isFontRegular: true,
+                      textColor: context.appColors.textBlack,
+                    ),
+                    MyTextView(
+                      " ${state.detail?.booking?.depositRefundAt ?? ""}",
+                      fontSize: 15,
+                      isFontMedium: true,
+                      textColor: context.appColors.textBlack,
+                    ),
+                  ],
+                ).marginOnly(top: 5),
+              ],
+            ),
           ),
 
           const SizedBox(height: 23),

packages/cpt_facility/lib/modules/detail/facility_detail_state.dart

@@ -1,3 +1,17 @@
-class FacilityDetailState{
+import 'package:domain/entity/facility_page_entity.dart';
 
-}
+class FacilityDetailState {
+  final FacilityDetail? detail;
+
+  FacilityDetailState({
+    this.detail,
+  });
+
+  FacilityDetailState copyWith({
+    FacilityDetail? detail,
+  }) {
+    return FacilityDetailState(
+      detail: detail ?? this.detail,
+    );
+  }
+}

packages/cpt_facility/lib/modules/detail/facility_detail_view_model.dart

@@ -1,3 +1,6 @@
+import 'package:domain/repository/facility_repository.dart';
+import 'package:plugin_platform/engine/toast/toast_engine.dart';
+import 'package:plugin_platform/http/dio/dio_cancelable_mixin.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import 'facility_detail_state.dart';
@@ -5,9 +8,26 @@ import 'facility_detail_state.dart';
 part 'facility_detail_view_model.g.dart';
 
 @riverpod
-class FacilityDetailViewModel extends _$FacilityDetailViewModel{
+class FacilityDetailViewModel extends _$FacilityDetailViewModel with DioCancelableMixin{
+  late final FacilityRepository _facilityRepository;
   @override
   FacilityDetailState build() {
-    return FacilityDetailState();
+    _facilityRepository = ref.read(facilityRepositoryProvider);
+    final state =  FacilityDetailState();
+    registerCancellation();
+    return state;
   }
+
+  /// 获取详情
+  Future fetchFacilityDetail(String? bookingId) async {
+    final result = await _facilityRepository.fetchFacilityBookingDetail(id: bookingId, cancelToken: cancelToken);
+
+    // 处理数据
+    if (result.isSuccess) {
+      state = state.copyWith(detail: result.data);
+    } else {
+      ToastEngine.show(result.errorMsg ?? "UnKnow Error");
+    }
+  }
+
 }

packages/cpt_facility/lib/modules/detail/facility_detail_view_model.g.dart

@@ -7,7 +7,7 @@ part of 'facility_detail_view_model.dart';
 // **************************************************************************
 
 String _$facilityDetailViewModelHash() =>
-    r'fc7e226b3c796f8790a9715a13656c06d1b98b20';
+    r'8a361195ada0787beab9b28c38810c95acc51156';
 
 /// See also [FacilityDetailViewModel].
 @ProviderFor(FacilityDetailViewModel)

packages/cpt_facility/lib/modules/facility/active/facility_active_screen.dart

@@ -10,7 +10,6 @@ import '../../detail/facility_detail_page.dart';
 import 'facility_active_view_model.dart';
 import 'item_facility_active.dart';
 
-
 @RoutePage()
 class FacilityActiveScreen extends HookConsumerWidget {
   @override
@@ -42,13 +41,13 @@ class FacilityActiveScreen extends HookConsumerWidget {
           successSliverWidget: [
             SliverList(
                 delegate: SliverChildBuilderDelegate(
-                      (context, index) {
-                    return FacilityActiveItem(index: index, item: state.datas[index]).onTap((){
-                      // FacilityDetailPage.startInstance(context: context);
-                    });
-                  },
-                  childCount: state.datas.length,
-                ))
+              (context, index) {
+                return FacilityActiveItem(index: index, item: state.datas[index]).onTap(() {
+                  FacilityDetailPage.startInstance(context: context, bookingId: state.datas[index].booking?.id);
+                });
+              },
+              childCount: state.datas.length,
+            ))
           ],
         ),
       ).marginOnly(top: 5, bottom: 5),

packages/cpt_facility/lib/modules/facility/active/facility_active_state.dart

@@ -7,7 +7,7 @@ class FacilityActiveState {
   LoadState loadingState;
   String? errorMessage;
 
-  List<FacilityPageList> datas; //页面列表数据
+  List<FacilityDetail> datas; //页面列表数据
 
   // ===================================  Begin  ↓  ===================================
 
@@ -21,7 +21,7 @@ class FacilityActiveState {
     LoadState? loadingState,
     String? errorMessage,
     bool? needShowPlaceholder,
-    List<FacilityPageList>? datas,
+    List<FacilityDetail>? datas,
   }) {
     return FacilityActiveState(
       errorMessage: errorMessage ?? this.errorMessage,

packages/cpt_facility/lib/modules/facility/active/facility_active_view_model.dart

@@ -78,7 +78,7 @@ class FacilityActiveViewModel extends _$FacilityActiveViewModel with DioCancelab
   }
 
   // 处理数据与展示的逻辑
-  void handleList(List<FacilityPageList>? list) {
+  void handleList(List<FacilityDetail>? list) {
     if (list != null && list.isNotEmpty) {
       //有数据，判断是刷新还是加载更多的数据
       if (_curPage == 1) {
@@ -90,7 +90,7 @@ class FacilityActiveViewModel extends _$FacilityActiveViewModel with DioCancelab
         changeLoadingState(LoadState.State_Success, null);
       } else {
         //加载更多
-        state.datas.addAll(List<FacilityPageList>.from(state.datas)..addAll(list));
+        state.datas.addAll(List<FacilityDetail>.from(state.datas)..addAll(list));
         refreshController.finishLoad();
       }
     } else {

packages/cpt_facility/lib/modules/facility/active/facility_active_view_model.g.dart

@@ -7,7 +7,7 @@ part of 'facility_active_view_model.dart';
 // **************************************************************************
 
 String _$facilityActiveViewModelHash() =>
-    r'57bc96b84547eef379f700777115155343b5cb78';
+    r'c15699785d72e6c5965eb0f97eed8b03386fc75b';
 
 /// See also [FacilityActiveViewModel].
 @ProviderFor(FacilityActiveViewModel)

packages/cpt_facility/lib/modules/facility/active/item_facility_active.dart

@@ -9,7 +9,7 @@ import 'package:widgets/my_text_view.dart';
 ///  设施的Active的Item
 class FacilityActiveItem extends StatelessWidget {
   final int index;
-  final FacilityPageList item;
+  final FacilityDetail item;
 
   const FacilityActiveItem({
     required this.index,

packages/cpt_facility/lib/modules/facility/deposit/facility_deposit_screen.dart

@@ -49,7 +49,7 @@ class FacilityDepositScreen extends HookConsumerWidget {
                 delegate: SliverChildBuilderDelegate(
               (context, index) {
                 return FacilityDepositItem(index: index, item: state.datas[index]).onTap(() {
-                  FacilityDetailPage.startInstance(context: context);
+                  FacilityDetailPage.startInstance(context: context,bookingId: state.datas[index].booking?.id);
                 });
               },
               childCount: state.datas.length,
@@ -116,12 +116,19 @@ class FacilityDepositScreen extends HookConsumerWidget {
     );
   }
 
-  //底部的说明文本脚布局
+  /// 构建页面底部组件
+  ///
+  /// [BuildContext context] 用于访问当前构建上下文，以便获取主题颜色等信息
+  /// [WidgetRef ref] 用于访问和操作应用状态
+  ///
+  /// 返回一个SliverToBoxAdapter，它包含一个列布局，其中包含两个文本视图
+  /// 第一个文本视图显示存款描述的标题，第二个文本视图显示具体的存款描述文本
   _buildFootWidget(BuildContext context, WidgetRef ref) {
     return SliverToBoxAdapter(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
+          // 显示存款描述标题的文本视图
           MyTextView(
             S.current.deposit_desc,
             fontSize: 20,
@@ -131,6 +138,7 @@ class FacilityDepositScreen extends HookConsumerWidget {
             isFontMedium: true,
             textColor: context.appColors.textBlack,
           ),
+          // 显示具体存款描述文本的文本视图
           MyTextView(
             S.current.deposit_desc_txt,
             marginTop: 14,
@@ -145,4 +153,5 @@ class FacilityDepositScreen extends HookConsumerWidget {
       ),
     );
   }
+
 }

packages/cpt_facility/lib/modules/facility/deposit/facility_deposit_state.dart

@@ -9,7 +9,7 @@ class FacilityDepositState {
 
   String? totalDeposit;  //总金额
 
-  List<FacilityPageList> datas; //页面列表数据
+  List<FacilityDetail> datas; //页面列表数据
 
   // ===================================  Begin  ↓  ===================================
 
@@ -24,7 +24,7 @@ class FacilityDepositState {
     LoadState? loadingState,
     String? errorMessage,
     bool? needShowPlaceholder,
-    List<FacilityPageList>? datas,
+    List<FacilityDetail>? datas,
     String? totalDeposit,
   }) {
     return FacilityDepositState(

packages/cpt_facility/lib/modules/facility/deposit/facility_deposit_view_model.dart

@@ -72,7 +72,7 @@ class FacilityDepositViewModel extends _$FacilityDepositViewModel with DioCancel
   }
 
   // 处理数据与展示的逻辑
-  void handleList(List<FacilityPageList>? list) {
+  void handleList(List<FacilityDetail>? list) {
     if (list != null && list.isNotEmpty) {
       //有数据，判断是刷新还是加载更多的数据
       if (_curPage == 1) {
@@ -84,7 +84,7 @@ class FacilityDepositViewModel extends _$FacilityDepositViewModel with DioCancel
         changeLoadingState(LoadState.State_Success, null);
       } else {
         //加载更多
-        state.datas.addAll(List<FacilityPageList>.from(state.datas)..addAll(list));
+        state.datas.addAll(List<FacilityDetail>.from(state.datas)..addAll(list));
         refreshController.finishLoad();
       }
     } else {

packages/cpt_facility/lib/modules/facility/deposit/facility_deposit_view_model.g.dart

@@ -7,7 +7,7 @@ part of 'facility_deposit_view_model.dart';
 // **************************************************************************
 
 String _$facilityDepositViewModelHash() =>
-    r'2b35e0ffd671d3ab67217b51dc076475f7e2a00a';
+    r'8e4a73e233a2fad49624f2be471b578a5ff28bbd';
 
 /// See also [FacilityDepositViewModel].
 @ProviderFor(FacilityDepositViewModel)

packages/cpt_facility/lib/modules/facility/deposit/item_facility_deposit.dart

@@ -9,7 +9,7 @@ import 'package:widgets/my_text_view.dart';
 ///  设施的Deposit的Item
 class FacilityDepositItem extends StatelessWidget {
   final int index;
-  final FacilityPageList item;
+  final FacilityDetail item;
 
   const FacilityDepositItem({
     required this.index,

packages/cpt_facility/lib/modules/facility/history/facility_history_screen.dart

@@ -42,7 +42,7 @@ class FacilityHistoryScreen extends HookConsumerWidget {
             SliverList(
                 delegate: SliverChildBuilderDelegate((context, index) {
                     return FacilityHistoryItem(index: index, item: state.datas[index]).onTap((){
-                      FacilityDetailPage.startInstance(context: context);
+                      FacilityDetailPage.startInstance(context: context,bookingId: state.datas[index].booking?.id);
                     });
                   },
                   childCount: state.datas.length,

packages/cpt_facility/lib/modules/facility/history/facility_history_state.dart

@@ -7,7 +7,7 @@ class FacilityHistoryState {
   LoadState loadingState;
   String? errorMessage;
 
-  List<FacilityPageList> datas; //页面列表数据
+  List<FacilityDetail> datas; //页面列表数据
 
   // ===================================  Begin  ↓  ===================================
 
@@ -21,7 +21,7 @@ class FacilityHistoryState {
     LoadState? loadingState,
     String? errorMessage,
     bool? needShowPlaceholder,
-    List<FacilityPageList>? datas,
+    List<FacilityDetail>? datas,
   }) {
     return FacilityHistoryState(
       errorMessage: errorMessage ?? this.errorMessage,

packages/cpt_facility/lib/modules/facility/history/facility_history_view_model.dart

@@ -78,7 +78,7 @@ class FacilityHistoryViewModel extends _$FacilityHistoryViewModel with DioCancel
   }
 
   // 处理数据与展示的逻辑
-  void handleList(List<FacilityPageList>? list) {
+  void handleList(List<FacilityDetail>? list) {
     if (list != null && list.isNotEmpty) {
       //有数据，判断是刷新还是加载更多的数据
       if (_curPage == 1) {
@@ -90,7 +90,7 @@ class FacilityHistoryViewModel extends _$FacilityHistoryViewModel with DioCancel
         changeLoadingState(LoadState.State_Success, null);
       } else {
         //加载更多
-        state.datas.addAll(List<FacilityPageList>.from(state.datas)..addAll(list));
+        state.datas.addAll(List<FacilityDetail>.from(state.datas)..addAll(list));
         refreshController.finishLoad();
       }
     } else {

packages/cpt_facility/lib/modules/facility/history/facility_history_view_model.g.dart

@@ -7,7 +7,7 @@ part of 'facility_history_view_model.dart';
 // **************************************************************************
 
 String _$facilityHistoryViewModelHash() =>
-    r'2565bb75a59c1a94a8c39d5d5985a9e9422b50f0';
+    r'303f1d156d9b2cf7e1fa90ee4922868897e7ddcc';
 
 /// See also [FacilityHistoryViewModel].
 @ProviderFor(FacilityHistoryViewModel)

packages/cpt_facility/lib/modules/facility/history/item_facility_history.dart

@@ -9,7 +9,7 @@ import 'package:widgets/my_text_view.dart';
 ///  设施的History的Item
 class FacilityHistoryItem extends StatelessWidget {
   final int index;
-  final FacilityPageList item;
+  final FacilityDetail item;
 
   const FacilityHistoryItem({
     required this.index,

packages/cpt_facility/lib/router/page/facility_page_router.gr.dart

@@ -51,9 +51,13 @@ abstract class _$FacilityPageRouter extends RootStackRouter {
       );
     },
     FacilityDetailPageRoute.name: (routeData) {
+      final args = routeData.argsAs<FacilityDetailPageRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: const FacilityDetailPage(),
+        child: FacilityDetailPage(
+          key: args.key,
+          bookingId: args.bookingId,
+        ),
       );
     },
     FacilityHistoryPageRoute.name: (routeData) {
@@ -183,16 +187,41 @@ class FacilityDepositPageRoute extends PageRouteInfo<void> {
 
 /// generated route for
 /// [FacilityDetailPage]
-class FacilityDetailPageRoute extends PageRouteInfo<void> {
-  const FacilityDetailPageRoute({List<PageRouteInfo>? children})
-      : super(
+class FacilityDetailPageRoute
+    extends PageRouteInfo<FacilityDetailPageRouteArgs> {
+  FacilityDetailPageRoute({
+    Key? key,
+    required String? bookingId,
+    List<PageRouteInfo>? children,
+  }) : super(
           FacilityDetailPageRoute.name,
+          args: FacilityDetailPageRouteArgs(
+            key: key,
+            bookingId: bookingId,
+          ),
           initialChildren: children,
         );
 
   static const String name = 'FacilityDetailPageRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static const PageInfo<FacilityDetailPageRouteArgs> page =
+      PageInfo<FacilityDetailPageRouteArgs>(name);
+}
+
+class FacilityDetailPageRouteArgs {
+  const FacilityDetailPageRouteArgs({
+    this.key,
+    required this.bookingId,
+  });
+
+  final Key? key;
+
+  final String? bookingId;
+
+  @override
+  String toString() {
+    return 'FacilityDetailPageRouteArgs{key: $key, bookingId: $bookingId}';
+  }
 }
 
 /// generated route for

packages/cs_domain/lib/constants/api_constants.dart

@@ -119,6 +119,10 @@ class ApiConstants {
   //当前已预定的历史记录
   static const apiFacilityHistoryList = "/api/v1/user/facility/history/index";
 
+  //获取预约Booking的详情
+  static const apiFacilityBookingDetail = "/api/v1/user/facility/booking/detail";
+
+
   // =========================== 其他 ↓=========================================
 
   //服务器时间

packages/cs_domain/lib/entity/facility_page_entity.dart

@@ -13,7 +13,7 @@ class FacilityPageEntity {
 	@JSONField(name: "total_deposit")
 	String? totalDeposit;
 
-	List<FacilityPageList>? list = [];
+	List<FacilityDetail>? list = [];
 
 	FacilityPageEntity();
 
@@ -28,18 +28,18 @@ class FacilityPageEntity {
 }
 
 @JsonSerializable()
-class FacilityPageList {
+class FacilityDetail {
 	FacilityPageListBooking? booking;
 	FacilityPageListFacility? facility;
 	@JSONField(name: "time_period")
 	FacilityPageListTimePeriod? timePeriod;
 	FacilityPageListAccount? account;
 
-	FacilityPageList();
+	FacilityDetail();
 
-	factory FacilityPageList.fromJson(Map<String, dynamic> json) => $FacilityPageListFromJson(json);
+	factory FacilityDetail.fromJson(Map<String, dynamic> json) => $FacilityDetailFromJson(json);
 
-	Map<String, dynamic> toJson() => $FacilityPageListToJson(this);
+	Map<String, dynamic> toJson() => $FacilityDetailToJson(this);
 
 	@override
 	String toString() {
@@ -49,6 +49,7 @@ class FacilityPageList {
 
 @JsonSerializable()
 class FacilityPageListBooking {
+	String? id;
 	String? date;
 	String? start;
 	String? end;
@@ -56,6 +57,8 @@ class FacilityPageListBooking {
 	String? depositPaid;
 	@JSONField(name: "deposit_refund")
 	String? depositRefund;
+	@JSONField(name: "deposit_refund_at")
+	String? depositRefundAt;
 
 	FacilityPageListBooking();
 

packages/cs_domain/lib/generated/json/base/json_convert_content.dart

@@ -84,14 +84,12 @@ class JsonConvert {
     }
   }
 
-  List<T?>? convertList<T>(List<dynamic>? value,
-      {EnumConvertFunction? enumConvert}) {
+  List<T?>? convertList<T>(List<dynamic>? value, {EnumConvertFunction? enumConvert}) {
     if (value == null) {
       return null;
     }
     try {
-      return value.map((dynamic e) => _asT<T>(e, enumConvert: enumConvert))
-          .toList();
+      return value.map((dynamic e) => _asT<T>(e, enumConvert: enumConvert)).toList();
     } catch (e, stackTrace) {
       debugPrint('asT<$T> $e $stackTrace');
       if (onError != null) {
@@ -101,14 +99,12 @@ class JsonConvert {
     }
   }
 
-  List<T>? convertListNotNull<T>(dynamic value,
-      {EnumConvertFunction? enumConvert}) {
+  List<T>? convertListNotNull<T>(dynamic value, {EnumConvertFunction? enumConvert}) {
     if (value == null) {
       return null;
     }
     try {
-      return (value as List<dynamic>).map((dynamic e) =>
-      _asT<T>(e, enumConvert: enumConvert)!).toList();
+      return (value as List<dynamic>).map((dynamic e) => _asT<T>(e, enumConvert: enumConvert)!).toList();
     } catch (e, stackTrace) {
       debugPrint('asT<$T> $e $stackTrace');
       if (onError != null) {
@@ -156,8 +152,7 @@ class JsonConvert {
           return covertFunc(Map<String, dynamic>.from(value)) as T;
         }
       } else {
-        throw UnimplementedError(
-            '$type unimplemented,you can try running the app again');
+        throw UnimplementedError('$type unimplemented,you can try running the app again');
       }
     }
   }
@@ -165,12 +160,10 @@ class JsonConvert {
   //list is returned by type
   static M? _getListChildType<M>(List<Map<String, dynamic>> data) {
     if (<AuthLoginEntity>[] is M) {
-      return data.map<AuthLoginEntity>((Map<String, dynamic> e) =>
-          AuthLoginEntity.fromJson(e)).toList() as M;
+      return data.map<AuthLoginEntity>((Map<String, dynamic> e) => AuthLoginEntity.fromJson(e)).toList() as M;
     }
     if (<CaptchaImgEntity>[] is M) {
-      return data.map<CaptchaImgEntity>((Map<String, dynamic> e) =>
-          CaptchaImgEntity.fromJson(e)).toList() as M;
+      return data.map<CaptchaImgEntity>((Map<String, dynamic> e) => CaptchaImgEntity.fromJson(e)).toList() as M;
     }
     if (<FacilityBookEntity>[] is M) {
       return data.map<FacilityBookEntity>((Map<String, dynamic> e) => FacilityBookEntity.fromJson(e)).toList() as M;
@@ -187,8 +180,8 @@ class JsonConvert {
     if (<FacilityPageEntity>[] is M) {
       return data.map<FacilityPageEntity>((Map<String, dynamic> e) => FacilityPageEntity.fromJson(e)).toList() as M;
     }
-    if (<FacilityPageList>[] is M) {
-      return data.map<FacilityPageList>((Map<String, dynamic> e) => FacilityPageList.fromJson(e)).toList() as M;
+    if (<FacilityDetail>[] is M) {
+      return data.map<FacilityDetail>((Map<String, dynamic> e) => FacilityDetail.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListBooking>[] is M) {
       return data.map<FacilityPageListBooking>((Map<String, dynamic> e) => FacilityPageListBooking.fromJson(e)).toList() as M;
@@ -206,169 +199,127 @@ class JsonConvert {
       return data.map<FacilityPageListAccount>((Map<String, dynamic> e) => FacilityPageListAccount.fromJson(e)).toList() as M;
     }
     if (<FeedbackDetailEntity>[] is M) {
-      return data.map<FeedbackDetailEntity>((Map<String, dynamic> e) =>
-          FeedbackDetailEntity.fromJson(e)).toList() as M;
+      return data.map<FeedbackDetailEntity>((Map<String, dynamic> e) => FeedbackDetailEntity.fromJson(e)).toList() as M;
     }
     if (<FeedbackDetailReplies>[] is M) {
-      return data.map<FeedbackDetailReplies>((Map<String, dynamic> e) =>
-          FeedbackDetailReplies.fromJson(e)).toList() as M;
+      return data.map<FeedbackDetailReplies>((Map<String, dynamic> e) => FeedbackDetailReplies.fromJson(e)).toList() as M;
     }
     if (<FeedbackListEntity>[] is M) {
-      return data.map<FeedbackListEntity>((Map<String, dynamic> e) =>
-          FeedbackListEntity.fromJson(e)).toList() as M;
+      return data.map<FeedbackListEntity>((Map<String, dynamic> e) => FeedbackListEntity.fromJson(e)).toList() as M;
     }
     if (<FeedbackItemEntity>[] is M) {
-      return data.map<FeedbackItemEntity>((Map<String, dynamic> e) =>
-          FeedbackItemEntity.fromJson(e)).toList() as M;
+      return data.map<FeedbackItemEntity>((Map<String, dynamic> e) => FeedbackItemEntity.fromJson(e)).toList() as M;
     }
     if (<FormContentEntity>[] is M) {
-      return data.map<FormContentEntity>((Map<String, dynamic> e) =>
-          FormContentEntity.fromJson(e)).toList() as M;
+      return data.map<FormContentEntity>((Map<String, dynamic> e) => FormContentEntity.fromJson(e)).toList() as M;
     }
     if (<FormDetailEntity>[] is M) {
-      return data.map<FormDetailEntity>((Map<String, dynamic> e) =>
-          FormDetailEntity.fromJson(e)).toList() as M;
+      return data.map<FormDetailEntity>((Map<String, dynamic> e) => FormDetailEntity.fromJson(e)).toList() as M;
     }
     if (<FormListEntity>[] is M) {
-      return data.map<FormListEntity>((Map<String, dynamic> e) =>
-          FormListEntity.fromJson(e)).toList() as M;
+      return data.map<FormListEntity>((Map<String, dynamic> e) => FormListEntity.fromJson(e)).toList() as M;
     }
     if (<FormOptionEntity>[] is M) {
-      return data.map<FormOptionEntity>((Map<String, dynamic> e) =>
-          FormOptionEntity.fromJson(e)).toList() as M;
+      return data.map<FormOptionEntity>((Map<String, dynamic> e) => FormOptionEntity.fromJson(e)).toList() as M;
     }
     if (<FormSubmittedEntity>[] is M) {
-      return data.map<FormSubmittedEntity>((Map<String, dynamic> e) =>
-          FormSubmittedEntity.fromJson(e)).toList() as M;
+      return data.map<FormSubmittedEntity>((Map<String, dynamic> e) => FormSubmittedEntity.fromJson(e)).toList() as M;
     }
     if (<FormSubmittedEstateOnlineForm>[] is M) {
-      return data.map<FormSubmittedEstateOnlineForm>((Map<String, dynamic> e) =>
-          FormSubmittedEstateOnlineForm.fromJson(e)).toList() as M;
+      return data.map<FormSubmittedEstateOnlineForm>((Map<String, dynamic> e) => FormSubmittedEstateOnlineForm.fromJson(e)).toList() as M;
     }
     if (<FormSubmittedPageEntity>[] is M) {
-      return data.map<FormSubmittedPageEntity>((Map<String, dynamic> e) =>
-          FormSubmittedPageEntity.fromJson(e)).toList() as M;
+      return data.map<FormSubmittedPageEntity>((Map<String, dynamic> e) => FormSubmittedPageEntity.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentEntity>[] is M) {
-      return data.map<GarageSaleRentEntity>((Map<String, dynamic> e) =>
-          GarageSaleRentEntity.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentEntity>((Map<String, dynamic> e) => GarageSaleRentEntity.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentAccount>[] is M) {
-      return data.map<GarageSaleRentAccount>((Map<String, dynamic> e) =>
-          GarageSaleRentAccount.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentAccount>((Map<String, dynamic> e) => GarageSaleRentAccount.fromJson(e)).toList() as M;
     }
     if (<IdNameEntity>[] is M) {
-      return data.map<IdNameEntity>((Map<String, dynamic> e) =>
-          IdNameEntity.fromJson(e)).toList() as M;
+      return data.map<IdNameEntity>((Map<String, dynamic> e) => IdNameEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedCommentPublishEntity>[] is M) {
-      return data.map<NewsfeedCommentPublishEntity>((Map<String, dynamic> e) =>
-          NewsfeedCommentPublishEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedCommentPublishEntity>((Map<String, dynamic> e) => NewsfeedCommentPublishEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailEntity>[] is M) {
-      return data.map<NewsfeedDetailEntity>((Map<String, dynamic> e) =>
-          NewsfeedDetailEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailEntity>((Map<String, dynamic> e) => NewsfeedDetailEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailAccount>[] is M) {
-      return data.map<NewsfeedDetailAccount>((Map<String, dynamic> e) =>
-          NewsfeedDetailAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailAccount>((Map<String, dynamic> e) => NewsfeedDetailAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailComments>[] is M) {
-      return data.map<NewsfeedDetailComments>((Map<String, dynamic> e) =>
-          NewsfeedDetailComments.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailComments>((Map<String, dynamic> e) => NewsfeedDetailComments.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailCommentsAccount>[] is M) {
-      return data.map<NewsfeedDetailCommentsAccount>((Map<String, dynamic> e) =>
-          NewsfeedDetailCommentsAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailCommentsAccount>((Map<String, dynamic> e) => NewsfeedDetailCommentsAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailCommentsToAccount>[] is M) {
-      return data.map<NewsfeedDetailCommentsToAccount>((
-          Map<String, dynamic> e) =>
-          NewsfeedDetailCommentsToAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailCommentsToAccount>((Map<String, dynamic> e) => NewsfeedDetailCommentsToAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedFollowingEntity>[] is M) {
-      return data.map<NewsfeedFollowingEntity>((Map<String, dynamic> e) =>
-          NewsfeedFollowingEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedFollowingEntity>((Map<String, dynamic> e) => NewsfeedFollowingEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedFollowingList>[] is M) {
-      return data.map<NewsfeedFollowingList>((Map<String, dynamic> e) =>
-          NewsfeedFollowingList.fromJson(e)).toList() as M;
+      return data.map<NewsfeedFollowingList>((Map<String, dynamic> e) => NewsfeedFollowingList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedFollowingListAccount>[] is M) {
-      return data.map<NewsfeedFollowingListAccount>((Map<String, dynamic> e) =>
-          NewsfeedFollowingListAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedFollowingListAccount>((Map<String, dynamic> e) => NewsfeedFollowingListAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedForyouEntity>[] is M) {
-      return data.map<NewsfeedForyouEntity>((Map<String, dynamic> e) =>
-          NewsfeedForyouEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedForyouEntity>((Map<String, dynamic> e) => NewsfeedForyouEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedForyouList>[] is M) {
-      return data.map<NewsfeedForyouList>((Map<String, dynamic> e) =>
-          NewsfeedForyouList.fromJson(e)).toList() as M;
+      return data.map<NewsfeedForyouList>((Map<String, dynamic> e) => NewsfeedForyouList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedForyouListAccount>[] is M) {
-      return data.map<NewsfeedForyouListAccount>((Map<String, dynamic> e) =>
-          NewsfeedForyouListAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedForyouListAccount>((Map<String, dynamic> e) => NewsfeedForyouListAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedNewsEntity>[] is M) {
-      return data.map<NewsfeedNewsEntity>((Map<String, dynamic> e) =>
-          NewsfeedNewsEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedNewsEntity>((Map<String, dynamic> e) => NewsfeedNewsEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedNewsList>[] is M) {
-      return data.map<NewsfeedNewsList>((Map<String, dynamic> e) =>
-          NewsfeedNewsList.fromJson(e)).toList() as M;
+      return data.map<NewsfeedNewsList>((Map<String, dynamic> e) => NewsfeedNewsList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedNewsListAccount>[] is M) {
-      return data.map<NewsfeedNewsListAccount>((Map<String, dynamic> e) =>
-          NewsfeedNewsListAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedNewsListAccount>((Map<String, dynamic> e) => NewsfeedNewsListAccount.fromJson(e)).toList() as M;
     }
     if (<PropertyNewsEntity>[] is M) {
-      return data.map<PropertyNewsEntity>((Map<String, dynamic> e) =>
-          PropertyNewsEntity.fromJson(e)).toList() as M;
+      return data.map<PropertyNewsEntity>((Map<String, dynamic> e) => PropertyNewsEntity.fromJson(e)).toList() as M;
     }
     if (<PropertyNewsList>[] is M) {
-      return data.map<PropertyNewsList>((Map<String, dynamic> e) =>
-          PropertyNewsList.fromJson(e)).toList() as M;
+      return data.map<PropertyNewsList>((Map<String, dynamic> e) => PropertyNewsList.fromJson(e)).toList() as M;
     }
     if (<PropertySaleRentEntity>[] is M) {
-      return data.map<PropertySaleRentEntity>((Map<String, dynamic> e) =>
-          PropertySaleRentEntity.fromJson(e)).toList() as M;
+      return data.map<PropertySaleRentEntity>((Map<String, dynamic> e) => PropertySaleRentEntity.fromJson(e)).toList() as M;
     }
     if (<PropertySaleRentList>[] is M) {
-      return data.map<PropertySaleRentList>((Map<String, dynamic> e) =>
-          PropertySaleRentList.fromJson(e)).toList() as M;
+      return data.map<PropertySaleRentList>((Map<String, dynamic> e) => PropertySaleRentList.fromJson(e)).toList() as M;
     }
     if (<ServerTime>[] is M) {
-      return data.map<ServerTime>((Map<String, dynamic> e) =>
-          ServerTime.fromJson(e)).toList() as M;
+      return data.map<ServerTime>((Map<String, dynamic> e) => ServerTime.fromJson(e)).toList() as M;
     }
     if (<UserMeEntity>[] is M) {
-      return data.map<UserMeEntity>((Map<String, dynamic> e) =>
-          UserMeEntity.fromJson(e)).toList() as M;
+      return data.map<UserMeEntity>((Map<String, dynamic> e) => UserMeEntity.fromJson(e)).toList() as M;
     }
     if (<UserMeHouseholds>[] is M) {
-      return data.map<UserMeHouseholds>((Map<String, dynamic> e) =>
-          UserMeHouseholds.fromJson(e)).toList() as M;
+      return data.map<UserMeHouseholds>((Map<String, dynamic> e) => UserMeHouseholds.fromJson(e)).toList() as M;
     }
     if (<UserMeEstates>[] is M) {
-      return data.map<UserMeEstates>((Map<String, dynamic> e) =>
-          UserMeEstates.fromJson(e)).toList() as M;
+      return data.map<UserMeEstates>((Map<String, dynamic> e) => UserMeEstates.fromJson(e)).toList() as M;
     }
     if (<UserMeEstatesAccounts>[] is M) {
-      return data.map<UserMeEstatesAccounts>((Map<String, dynamic> e) =>
-          UserMeEstatesAccounts.fromJson(e)).toList() as M;
+      return data.map<UserMeEstatesAccounts>((Map<String, dynamic> e) => UserMeEstatesAccounts.fromJson(e)).toList() as M;
     }
     if (<UserMeEstatesAccountsUnit>[] is M) {
-      return data.map<UserMeEstatesAccountsUnit>((Map<String, dynamic> e) =>
-          UserMeEstatesAccountsUnit.fromJson(e)).toList() as M;
+      return data.map<UserMeEstatesAccountsUnit>((Map<String, dynamic> e) => UserMeEstatesAccountsUnit.fromJson(e)).toList() as M;
     }
     if (<UserMeDefaultUnit>[] is M) {
-      return data.map<UserMeDefaultUnit>((Map<String, dynamic> e) =>
-          UserMeDefaultUnit.fromJson(e)).toList() as M;
+      return data.map<UserMeDefaultUnit>((Map<String, dynamic> e) => UserMeDefaultUnit.fromJson(e)).toList() as M;
     }
     if (<UserMeInformation>[] is M) {
-      return data.map<UserMeInformation>((Map<String, dynamic> e) =>
-          UserMeInformation.fromJson(e)).toList() as M;
+      return data.map<UserMeInformation>((Map<String, dynamic> e) => UserMeInformation.fromJson(e)).toList() as M;
     }
 
     debugPrint("$M not found");
@@ -381,8 +332,7 @@ class JsonConvert {
       return json;
     }
     if (json is List) {
-      return _getListChildType<M>(
-          json.map((dynamic e) => e as Map<String, dynamic>).toList());
+      return _getListChildType<M>(json.map((dynamic e) => e as Map<String, dynamic>).toList());
     } else {
       return jsonConvert.convert<M>(json);
     }
@@ -398,7 +348,7 @@ class JsonConvertClassCollection {
     (FacilityBookFacilities).toString(): FacilityBookFacilities.fromJson,
     (FacilityBookFacilitiesPeriods).toString(): FacilityBookFacilitiesPeriods.fromJson,
     (FacilityPageEntity).toString(): FacilityPageEntity.fromJson,
-    (FacilityPageList).toString(): FacilityPageList.fromJson,
+    (FacilityDetail).toString(): FacilityDetail.fromJson,
     (FacilityPageListBooking).toString(): FacilityPageListBooking.fromJson,
     (FacilityPageListFacility).toString(): FacilityPageListFacility.fromJson,
     (FacilityPageListFacilityType).toString(): FacilityPageListFacilityType.fromJson,
@@ -413,25 +363,20 @@ class JsonConvertClassCollection {
     (FormListEntity).toString(): FormListEntity.fromJson,
     (FormOptionEntity).toString(): FormOptionEntity.fromJson,
     (FormSubmittedEntity).toString(): FormSubmittedEntity.fromJson,
-    (FormSubmittedEstateOnlineForm).toString(): FormSubmittedEstateOnlineForm
-        .fromJson,
+    (FormSubmittedEstateOnlineForm).toString(): FormSubmittedEstateOnlineForm.fromJson,
     (FormSubmittedPageEntity).toString(): FormSubmittedPageEntity.fromJson,
     (GarageSaleRentEntity).toString(): GarageSaleRentEntity.fromJson,
     (GarageSaleRentAccount).toString(): GarageSaleRentAccount.fromJson,
     (IdNameEntity).toString(): IdNameEntity.fromJson,
-    (NewsfeedCommentPublishEntity).toString(): NewsfeedCommentPublishEntity
-        .fromJson,
+    (NewsfeedCommentPublishEntity).toString(): NewsfeedCommentPublishEntity.fromJson,
     (NewsfeedDetailEntity).toString(): NewsfeedDetailEntity.fromJson,
     (NewsfeedDetailAccount).toString(): NewsfeedDetailAccount.fromJson,
     (NewsfeedDetailComments).toString(): NewsfeedDetailComments.fromJson,
-    (NewsfeedDetailCommentsAccount).toString(): NewsfeedDetailCommentsAccount
-        .fromJson,
-    (NewsfeedDetailCommentsToAccount)
-        .toString(): NewsfeedDetailCommentsToAccount.fromJson,
+    (NewsfeedDetailCommentsAccount).toString(): NewsfeedDetailCommentsAccount.fromJson,
+    (NewsfeedDetailCommentsToAccount).toString(): NewsfeedDetailCommentsToAccount.fromJson,
     (NewsfeedFollowingEntity).toString(): NewsfeedFollowingEntity.fromJson,
     (NewsfeedFollowingList).toString(): NewsfeedFollowingList.fromJson,
-    (NewsfeedFollowingListAccount).toString(): NewsfeedFollowingListAccount
-        .fromJson,
+    (NewsfeedFollowingListAccount).toString(): NewsfeedFollowingListAccount.fromJson,
     (NewsfeedForyouEntity).toString(): NewsfeedForyouEntity.fromJson,
     (NewsfeedForyouList).toString(): NewsfeedForyouList.fromJson,
     (NewsfeedForyouListAccount).toString(): NewsfeedForyouListAccount.fromJson,

packages/cs_domain/lib/generated/json/facility_page_entity.g.dart

@@ -23,8 +23,8 @@ FacilityPageEntity $FacilityPageEntityFromJson(Map<String, dynamic> json) {
   if (totalDeposit != null) {
     facilityPageEntity.totalDeposit = totalDeposit;
   }
-  final List<FacilityPageList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FacilityPageList>(e) as FacilityPageList).toList();
+  final List<FacilityDetail>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FacilityDetail>(e) as FacilityDetail).toList();
   if (list != null) {
     facilityPageEntity.list = list;
   }
@@ -49,7 +49,7 @@ extension FacilityPageEntityExtension on FacilityPageEntity {
     int? limit,
     int? countPage,
     String? totalDeposit,
-    List<FacilityPageList>? list,
+    List<FacilityDetail>? list,
   }) {
     return FacilityPageEntity()
       ..count = count ?? this.count
@@ -61,28 +61,28 @@ extension FacilityPageEntityExtension on FacilityPageEntity {
   }
 }
 
-FacilityPageList $FacilityPageListFromJson(Map<String, dynamic> json) {
-  final FacilityPageList facilityPageList = FacilityPageList();
+FacilityDetail $FacilityDetailFromJson(Map<String, dynamic> json) {
+  final FacilityDetail facilityDetail = FacilityDetail();
   final FacilityPageListBooking? booking = jsonConvert.convert<FacilityPageListBooking>(json['booking']);
   if (booking != null) {
-    facilityPageList.booking = booking;
+    facilityDetail.booking = booking;
   }
   final FacilityPageListFacility? facility = jsonConvert.convert<FacilityPageListFacility>(json['facility']);
   if (facility != null) {
-    facilityPageList.facility = facility;
+    facilityDetail.facility = facility;
   }
   final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<FacilityPageListTimePeriod>(json['time_period']);
   if (timePeriod != null) {
-    facilityPageList.timePeriod = timePeriod;
+    facilityDetail.timePeriod = timePeriod;
   }
   final FacilityPageListAccount? account = jsonConvert.convert<FacilityPageListAccount>(json['account']);
   if (account != null) {
-    facilityPageList.account = account;
+    facilityDetail.account = account;
   }
-  return facilityPageList;
+  return facilityDetail;
 }
 
-Map<String, dynamic> $FacilityPageListToJson(FacilityPageList entity) {
+Map<String, dynamic> $FacilityDetailToJson(FacilityDetail entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['booking'] = entity.booking?.toJson();
   data['facility'] = entity.facility?.toJson();
@@ -91,14 +91,14 @@ Map<String, dynamic> $FacilityPageListToJson(FacilityPageList entity) {
   return data;
 }
 
-extension FacilityPageListExtension on FacilityPageList {
-  FacilityPageList copyWith({
+extension FacilityDetailExtension on FacilityDetail {
+  FacilityDetail copyWith({
     FacilityPageListBooking? booking,
     FacilityPageListFacility? facility,
     FacilityPageListTimePeriod? timePeriod,
     FacilityPageListAccount? account,
   }) {
-    return FacilityPageList()
+    return FacilityDetail()
       ..booking = booking ?? this.booking
       ..facility = facility ?? this.facility
       ..timePeriod = timePeriod ?? this.timePeriod
@@ -108,6 +108,10 @@ extension FacilityPageListExtension on FacilityPageList {
 
 FacilityPageListBooking $FacilityPageListBookingFromJson(Map<String, dynamic> json) {
   final FacilityPageListBooking facilityPageListBooking = FacilityPageListBooking();
+  final String? id = jsonConvert.convert<String>(json['id']);
+  if (id != null) {
+    facilityPageListBooking.id = id;
+  }
   final String? date = jsonConvert.convert<String>(json['date']);
   if (date != null) {
     facilityPageListBooking.date = date;
@@ -128,33 +132,43 @@ FacilityPageListBooking $FacilityPageListBookingFromJson(Map<String, dynamic> js
   if (depositRefund != null) {
     facilityPageListBooking.depositRefund = depositRefund;
   }
+  final String? depositRefundAt = jsonConvert.convert<String>(json['deposit_refund_at']);
+  if (depositRefundAt != null) {
+    facilityPageListBooking.depositRefundAt = depositRefundAt;
+  }
   return facilityPageListBooking;
 }
 
 Map<String, dynamic> $FacilityPageListBookingToJson(FacilityPageListBooking entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
   data['date'] = entity.date;
   data['start'] = entity.start;
   data['end'] = entity.end;
   data['deposit_paid'] = entity.depositPaid;
   data['deposit_refund'] = entity.depositRefund;
+  data['deposit_refund_at'] = entity.depositRefundAt;
   return data;
 }
 
 extension FacilityPageListBookingExtension on FacilityPageListBooking {
   FacilityPageListBooking copyWith({
+    String? id,
     String? date,
     String? start,
     String? end,
     String? depositPaid,
     String? depositRefund,
+    String? depositRefundAt,
   }) {
     return FacilityPageListBooking()
+      ..id = id ?? this.id
       ..date = date ?? this.date
       ..start = start ?? this.start
       ..end = end ?? this.end
       ..depositPaid = depositPaid ?? this.depositPaid
-      ..depositRefund = depositRefund ?? this.depositRefund;
+      ..depositRefund = depositRefund ?? this.depositRefund
+      ..depositRefundAt = depositRefundAt ?? this.depositRefundAt;
   }
 }
 

packages/cs_domain/lib/generated/json/feedback_detail_entity.g.dart

@@ -30,17 +30,12 @@ FeedbackDetailEntity $FeedbackDetailEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     feedbackDetailEntity.createdAt = createdAt;
   }
-  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(
-      json['category']);
+  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(json['category']);
   if (category != null) {
     feedbackDetailEntity.category = category;
   }
-  final List<FeedbackDetailReplies>? replies = (json['replies'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FeedbackDetailReplies>(e) as FeedbackDetailReplies)
-      .toList();
+  final List<FeedbackDetailReplies>? replies = (json['replies'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FeedbackDetailReplies>(e) as FeedbackDetailReplies).toList();
   if (replies != null) {
     feedbackDetailEntity.replies = replies;
   }
@@ -83,8 +78,7 @@ extension FeedbackDetailEntityExtension on FeedbackDetailEntity {
   }
 }
 
-FeedbackDetailReplies $FeedbackDetailRepliesFromJson(
-    Map<String, dynamic> json) {
+FeedbackDetailReplies $FeedbackDetailRepliesFromJson(Map<String, dynamic> json) {
   final FeedbackDetailReplies feedbackDetailReplies = FeedbackDetailReplies();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -103,16 +97,14 @@ FeedbackDetailReplies $FeedbackDetailRepliesFromJson(
   if (createdAt != null) {
     feedbackDetailReplies.createdAt = createdAt;
   }
-  final IdNameEntity? accountable = jsonConvert.convert<IdNameEntity>(
-      json['accountable']);
+  final IdNameEntity? accountable = jsonConvert.convert<IdNameEntity>(json['accountable']);
   if (accountable != null) {
     feedbackDetailReplies.accountable = accountable;
   }
   return feedbackDetailReplies;
 }
 
-Map<String, dynamic> $FeedbackDetailRepliesToJson(
-    FeedbackDetailReplies entity) {
+Map<String, dynamic> $FeedbackDetailRepliesToJson(FeedbackDetailReplies entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;

packages/cs_domain/lib/generated/json/feedback_list_entity.g.dart

@@ -21,11 +21,8 @@ FeedbackListEntity $FeedbackListEntityFromJson(Map<String, dynamic> json) {
   if (limit != null) {
     feedbackListEntity.limit = limit;
   }
-  final List<FeedbackItemEntity>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FeedbackItemEntity>(e) as FeedbackItemEntity)
-      .toList();
+  final List<FeedbackItemEntity>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FeedbackItemEntity>(e) as FeedbackItemEntity).toList();
   if (list != null) {
     feedbackListEntity.list = list;
   }
@@ -81,8 +78,7 @@ FeedbackItemEntity $FeedbackItemEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     feedbackItemEntity.createdAt = createdAt;
   }
-  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(
-      json['category']);
+  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(json['category']);
   if (category != null) {
     feedbackItemEntity.category = category;
   }

packages/cs_domain/lib/generated/json/form_content_entity.g.dart

@@ -5,25 +5,20 @@ import 'dart:typed_data';
 
 FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   final FormContentEntity formContentEntity = FormContentEntity();
-  final String? typeOfApplication = jsonConvert.convert<String>(
-      json['type_of_application']);
+  final String? typeOfApplication = jsonConvert.convert<String>(json['type_of_application']);
   if (typeOfApplication != null) {
     formContentEntity.typeOfApplication = typeOfApplication;
   }
-  final String? notesToRecipient = jsonConvert.convert<String>(
-      json['notes_to_recipient']);
+  final String? notesToRecipient = jsonConvert.convert<String>(json['notes_to_recipient']);
   if (notesToRecipient != null) {
     formContentEntity.notesToRecipient = notesToRecipient;
   }
-  final String? notesToManagement = jsonConvert.convert<String>(
-      json['notes_to_management']);
+  final String? notesToManagement = jsonConvert.convert<String>(json['notes_to_management']);
   if (notesToManagement != null) {
     formContentEntity.notesToManagement = notesToManagement;
   }
-  final List<String>? attachments = (json['attachments'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<String>(e) as String)
-      .toList();
+  final List<String>? attachments = (json['attachments'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<String>(e) as String).toList();
   if (attachments != null) {
     formContentEntity.attachments = attachments;
   }
@@ -35,13 +30,11 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (signatureByteData != null) {
     formContentEntity.signatureByteData = signatureByteData;
   }
-  final String? ownershipStatus = jsonConvert.convert<String>(
-      json['ownership_status']);
+  final String? ownershipStatus = jsonConvert.convert<String>(json['ownership_status']);
   if (ownershipStatus != null) {
     formContentEntity.ownershipStatus = ownershipStatus;
   }
-  final String? vehicleNumber = jsonConvert.convert<String>(
-      json['vehicle_number']);
+  final String? vehicleNumber = jsonConvert.convert<String>(json['vehicle_number']);
   if (vehicleNumber != null) {
     formContentEntity.vehicleNumber = vehicleNumber;
   }
@@ -49,8 +42,7 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (iuNumber != null) {
     formContentEntity.iuNumber = iuNumber;
   }
-  final String? vehicleMakeModelColour = jsonConvert.convert<String>(
-      json['vehicle_make_model_colour']);
+  final String? vehicleMakeModelColour = jsonConvert.convert<String>(json['vehicle_make_model_colour']);
   if (vehicleMakeModelColour != null) {
     formContentEntity.vehicleMakeModelColour = vehicleMakeModelColour;
   }
@@ -62,33 +54,27 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (endDate != null) {
     formContentEntity.endDate = endDate;
   }
-  final String? timeOrArrival = jsonConvert.convert<String>(
-      json['time_or_arrival']);
+  final String? timeOrArrival = jsonConvert.convert<String>(json['time_or_arrival']);
   if (timeOrArrival != null) {
     formContentEntity.timeOrArrival = timeOrArrival;
   }
-  final String? movingCompany = jsonConvert.convert<String>(
-      json['moving_company']);
+  final String? movingCompany = jsonConvert.convert<String>(json['moving_company']);
   if (movingCompany != null) {
     formContentEntity.movingCompany = movingCompany;
   }
-  final String? personInCharge = jsonConvert.convert<String>(
-      json['person_in_charge']);
+  final String? personInCharge = jsonConvert.convert<String>(json['person_in_charge']);
   if (personInCharge != null) {
     formContentEntity.personInCharge = personInCharge;
   }
-  final String? mobileNumber = jsonConvert.convert<String>(
-      json['mobile_number']);
+  final String? mobileNumber = jsonConvert.convert<String>(json['mobile_number']);
   if (mobileNumber != null) {
     formContentEntity.mobileNumber = mobileNumber;
   }
-  final String? companyAddress = jsonConvert.convert<String>(
-      json['company_address']);
+  final String? companyAddress = jsonConvert.convert<String>(json['company_address']);
   if (companyAddress != null) {
     formContentEntity.companyAddress = companyAddress;
   }
-  final String? dateOfEntry = jsonConvert.convert<String>(
-      json['date_of_entry']);
+  final String? dateOfEntry = jsonConvert.convert<String>(json['date_of_entry']);
   if (dateOfEntry != null) {
     formContentEntity.dateOfEntry = dateOfEntry;
   }
@@ -96,38 +82,31 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (guestName != null) {
     formContentEntity.guestName = guestName;
   }
-  final String? guestMobileNumber = jsonConvert.convert<String>(
-      json['guest_mobile_number']);
+  final String? guestMobileNumber = jsonConvert.convert<String>(json['guest_mobile_number']);
   if (guestMobileNumber != null) {
     formContentEntity.guestMobileNumber = guestMobileNumber;
   }
-  final String? renovationStartDate = jsonConvert.convert<String>(
-      json['renovation_start_date']);
+  final String? renovationStartDate = jsonConvert.convert<String>(json['renovation_start_date']);
   if (renovationStartDate != null) {
     formContentEntity.renovationStartDate = renovationStartDate;
   }
-  final String? renovationEndDate = jsonConvert.convert<String>(
-      json['renovation_end_date']);
+  final String? renovationEndDate = jsonConvert.convert<String>(json['renovation_end_date']);
   if (renovationEndDate != null) {
     formContentEntity.renovationEndDate = renovationEndDate;
   }
-  final String? hackingStartDate = jsonConvert.convert<String>(
-      json['hacking_start_date']);
+  final String? hackingStartDate = jsonConvert.convert<String>(json['hacking_start_date']);
   if (hackingStartDate != null) {
     formContentEntity.hackingStartDate = hackingStartDate;
   }
-  final String? hackingEndDate = jsonConvert.convert<String>(
-      json['hacking_end_date']);
+  final String? hackingEndDate = jsonConvert.convert<String>(json['hacking_end_date']);
   if (hackingEndDate != null) {
     formContentEntity.hackingEndDate = hackingEndDate;
   }
-  final String? renovationCompany = jsonConvert.convert<String>(
-      json['renovation_company']);
+  final String? renovationCompany = jsonConvert.convert<String>(json['renovation_company']);
   if (renovationCompany != null) {
     formContentEntity.renovationCompany = renovationCompany;
   }
-  final String? listOfRenovationWorks = jsonConvert.convert<String>(
-      json['list_of_renovation_works']);
+  final String? listOfRenovationWorks = jsonConvert.convert<String>(json['list_of_renovation_works']);
   if (listOfRenovationWorks != null) {
     formContentEntity.listOfRenovationWorks = listOfRenovationWorks;
   }
@@ -204,8 +183,7 @@ extension FormContentEntityExtension on FormContentEntity {
       ..ownershipStatus = ownershipStatus ?? this.ownershipStatus
       ..vehicleNumber = vehicleNumber ?? this.vehicleNumber
       ..iuNumber = iuNumber ?? this.iuNumber
-      ..vehicleMakeModelColour = vehicleMakeModelColour ??
-          this.vehicleMakeModelColour
+      ..vehicleMakeModelColour = vehicleMakeModelColour ?? this.vehicleMakeModelColour
       ..startDate = startDate ?? this.startDate
       ..endDate = endDate ?? this.endDate
       ..timeOrArrival = timeOrArrival ?? this.timeOrArrival
@@ -221,7 +199,6 @@ extension FormContentEntityExtension on FormContentEntity {
       ..hackingStartDate = hackingStartDate ?? this.hackingStartDate
       ..hackingEndDate = hackingEndDate ?? this.hackingEndDate
       ..renovationCompany = renovationCompany ?? this.renovationCompany
-      ..listOfRenovationWorks = listOfRenovationWorks ??
-          this.listOfRenovationWorks;
+      ..listOfRenovationWorks = listOfRenovationWorks ?? this.listOfRenovationWorks;
   }
 }

packages/cs_domain/lib/generated/json/form_detail_entity.g.dart

@@ -13,8 +13,7 @@ FormDetailEntity $FormDetailEntityFromJson(Map<String, dynamic> json) {
   if (userId != null) {
     formDetailEntity.userId = userId;
   }
-  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(
-      json['content']);
+  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(json['content']);
   if (content != null) {
     formDetailEntity.content = content;
   }

packages/cs_domain/lib/generated/json/form_list_entity.g.dart

@@ -7,8 +7,7 @@ FormListEntity $FormListEntityFromJson(Map<String, dynamic> json) {
   if (id != null) {
     formListEntity.id = id;
   }
-  final String? typeId = jsonConvert.convert<String>(
-      json['online_form_type_id']);
+  final String? typeId = jsonConvert.convert<String>(json['online_form_type_id']);
   if (typeId != null) {
     formListEntity.typeId = typeId;
   }

packages/cs_domain/lib/generated/json/form_option_entity.g.dart

@@ -3,14 +3,12 @@ import 'package:domain/entity/form_option_entity.dart';
 
 FormOptionEntity $FormOptionEntityFromJson(Map<String, dynamic> json) {
   final FormOptionEntity formOptionEntity = FormOptionEntity();
-  final List<String>? typeOfApplication = (json['type_of_application'] as List<
-      dynamic>?)?.map(
+  final List<String>? typeOfApplication = (json['type_of_application'] as List<dynamic>?)?.map(
           (e) => jsonConvert.convert<String>(e) as String).toList();
   if (typeOfApplication != null) {
     formOptionEntity.typeOfApplication = typeOfApplication;
   }
-  final List<String>? ownershipStatus = (json['ownership_status'] as List<
-      dynamic>?)?.map(
+  final List<String>? ownershipStatus = (json['ownership_status'] as List<dynamic>?)?.map(
           (e) => jsonConvert.convert<String>(e) as String).toList();
   if (ownershipStatus != null) {
     formOptionEntity.ownershipStatus = ownershipStatus;

packages/cs_domain/lib/generated/json/form_submitted_entity.g.dart

@@ -15,13 +15,11 @@ FormSubmittedEntity $FormSubmittedEntityFromJson(Map<String, dynamic> json) {
   if (userId != null) {
     formSubmittedEntity.userId = userId;
   }
-  final String? estateOnlineFormId = jsonConvert.convert<String>(
-      json['estate_online_form_id']);
+  final String? estateOnlineFormId = jsonConvert.convert<String>(json['estate_online_form_id']);
   if (estateOnlineFormId != null) {
     formSubmittedEntity.estateOnlineFormId = estateOnlineFormId;
   }
-  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(
-      json['content']);
+  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(json['content']);
   if (content != null) {
     formSubmittedEntity.content = content;
   }
@@ -37,13 +35,11 @@ FormSubmittedEntity $FormSubmittedEntityFromJson(Map<String, dynamic> json) {
   if (approvedOn != null) {
     formSubmittedEntity.approvedOn = approvedOn;
   }
-  final FormSubmittedEstateOnlineForm? estateOnlineForm = jsonConvert.convert<
-      FormSubmittedEstateOnlineForm>(json['estate_online_form']);
+  final FormSubmittedEstateOnlineForm? estateOnlineForm = jsonConvert.convert<FormSubmittedEstateOnlineForm>(json['estate_online_form']);
   if (estateOnlineForm != null) {
     formSubmittedEntity.estateOnlineForm = estateOnlineForm;
   }
-  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(
-      json['account']);
+  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(json['account']);
   if (account != null) {
     formSubmittedEntity.account = account;
   }
@@ -89,8 +85,7 @@ extension FormSubmittedEntityExtension on FormSubmittedEntity {
   }
 }
 
-FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(
-    Map<String, dynamic> json) {
+FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(Map<String, dynamic> json) {
   final FormSubmittedEstateOnlineForm formSubmittedEstateOnlineForm = FormSubmittedEstateOnlineForm();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -111,8 +106,7 @@ FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(
   return formSubmittedEstateOnlineForm;
 }
 
-Map<String, dynamic> $FormSubmittedEstateOnlineFormToJson(
-    FormSubmittedEstateOnlineForm entity) {
+Map<String, dynamic> $FormSubmittedEstateOnlineFormToJson(FormSubmittedEstateOnlineForm entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['icon'] = entity.icon;

packages/cs_domain/lib/generated/json/form_submitted_page_entity.g.dart

@@ -3,8 +3,7 @@ import 'package:domain/entity/form_submitted_page_entity.dart';
 import 'package:domain/entity/form_submitted_entity.dart';
 
 
-FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(
-    Map<String, dynamic> json) {
+FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(Map<String, dynamic> json) {
   final FormSubmittedPageEntity formSubmittedPageEntity = FormSubmittedPageEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -22,19 +21,15 @@ FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(
   if (countPage != null) {
     formSubmittedPageEntity.countPage = countPage;
   }
-  final List<FormSubmittedEntity>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<FormSubmittedEntity>(e) as FormSubmittedEntity)
-      .toList();
+  final List<FormSubmittedEntity>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<FormSubmittedEntity>(e) as FormSubmittedEntity).toList();
   if (list != null) {
     formSubmittedPageEntity.list = list;
   }
   return formSubmittedPageEntity;
 }
 
-Map<String, dynamic> $FormSubmittedPageEntityToJson(
-    FormSubmittedPageEntity entity) {
+Map<String, dynamic> $FormSubmittedPageEntityToJson(FormSubmittedPageEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

packages/cs_domain/lib/generated/json/garage_sale_rent_entity.g.dart

@@ -32,8 +32,7 @@ GarageSaleRentEntity $GarageSaleRentEntityFromJson(Map<String, dynamic> json) {
   if (likesCount != null) {
     garageSaleRentEntity.likesCount = likesCount;
   }
-  final GarageSaleRentAccount? account = jsonConvert.convert<
-      GarageSaleRentAccount>(json['account']);
+  final GarageSaleRentAccount? account = jsonConvert.convert<GarageSaleRentAccount>(json['account']);
   if (account != null) {
     garageSaleRentEntity.account = account;
   }
@@ -76,8 +75,7 @@ extension GarageSaleRentEntityExtension on GarageSaleRentEntity {
   }
 }
 
-GarageSaleRentAccount $GarageSaleRentAccountFromJson(
-    Map<String, dynamic> json) {
+GarageSaleRentAccount $GarageSaleRentAccountFromJson(Map<String, dynamic> json) {
   final GarageSaleRentAccount garageSaleRentAccount = GarageSaleRentAccount();
   final double? id = jsonConvert.convert<double>(json['id']);
   if (id != null) {
@@ -94,8 +92,7 @@ GarageSaleRentAccount $GarageSaleRentAccountFromJson(
   return garageSaleRentAccount;
 }
 
-Map<String, dynamic> $GarageSaleRentAccountToJson(
-    GarageSaleRentAccount entity) {
+Map<String, dynamic> $GarageSaleRentAccountToJson(GarageSaleRentAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/newsfeed_comment_publish_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/newsfeed_comment_publish_entity.dart';
 
-NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(
-    Map<String, dynamic> json) {
+NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(Map<String, dynamic> json) {
   final NewsfeedCommentPublishEntity newsfeedCommentPublishEntity = NewsfeedCommentPublishEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -19,8 +18,7 @@ NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(
   return newsfeedCommentPublishEntity;
 }
 
-Map<String, dynamic> $NewsfeedCommentPublishEntityToJson(
-    NewsfeedCommentPublishEntity entity) {
+Map<String, dynamic> $NewsfeedCommentPublishEntityToJson(NewsfeedCommentPublishEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;

packages/cs_domain/lib/generated/json/newsfeed_detail_entity.g.dart

@@ -40,17 +40,12 @@ NewsfeedDetailEntity $NewsfeedDetailEntityFromJson(Map<String, dynamic> json) {
   if (liked != null) {
     newsfeedDetailEntity.liked = liked;
   }
-  final NewsfeedDetailAccount? account = jsonConvert.convert<
-      NewsfeedDetailAccount>(json['account']);
+  final NewsfeedDetailAccount? account = jsonConvert.convert<NewsfeedDetailAccount>(json['account']);
   if (account != null) {
     newsfeedDetailEntity.account = account;
   }
-  final List<NewsfeedDetailComments>? comments = (json['comments'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NewsfeedDetailComments>(e) as NewsfeedDetailComments)
-      .toList();
+  final List<NewsfeedDetailComments>? comments = (json['comments'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedDetailComments>(e) as NewsfeedDetailComments).toList();
   if (comments != null) {
     newsfeedDetailEntity.comments = comments;
   }
@@ -102,8 +97,7 @@ extension NewsfeedDetailEntityExtension on NewsfeedDetailEntity {
   }
 }
 
-NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailAccount newsfeedDetailAccount = NewsfeedDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -124,8 +118,7 @@ NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(
   return newsfeedDetailAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailAccountToJson(
-    NewsfeedDetailAccount entity) {
+Map<String, dynamic> $NewsfeedDetailAccountToJson(NewsfeedDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -149,8 +142,7 @@ extension NewsfeedDetailAccountExtension on NewsfeedDetailAccount {
   }
 }
 
-NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailComments newsfeedDetailComments = NewsfeedDetailComments();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -164,21 +156,18 @@ NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(
   if (createdAt != null) {
     newsfeedDetailComments.createdAt = createdAt;
   }
-  final NewsfeedDetailCommentsAccount? account = jsonConvert.convert<
-      NewsfeedDetailCommentsAccount>(json['account']);
+  final NewsfeedDetailCommentsAccount? account = jsonConvert.convert<NewsfeedDetailCommentsAccount>(json['account']);
   if (account != null) {
     newsfeedDetailComments.account = account;
   }
-  final NewsfeedDetailCommentsToAccount? toAccount = jsonConvert.convert<
-      NewsfeedDetailCommentsToAccount>(json['to_account']);
+  final NewsfeedDetailCommentsToAccount? toAccount = jsonConvert.convert<NewsfeedDetailCommentsToAccount>(json['to_account']);
   if (toAccount != null) {
     newsfeedDetailComments.toAccount = toAccount;
   }
   return newsfeedDetailComments;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsToJson(
-    NewsfeedDetailComments entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsToJson(NewsfeedDetailComments entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;
@@ -205,8 +194,7 @@ extension NewsfeedDetailCommentsExtension on NewsfeedDetailComments {
   }
 }
 
-NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailCommentsAccount newsfeedDetailCommentsAccount = NewsfeedDetailCommentsAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -223,8 +211,7 @@ NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(
   return newsfeedDetailCommentsAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsAccountToJson(
-    NewsfeedDetailCommentsAccount entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsAccountToJson(NewsfeedDetailCommentsAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -245,8 +232,7 @@ extension NewsfeedDetailCommentsAccountExtension on NewsfeedDetailCommentsAccoun
   }
 }
 
-NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedDetailCommentsToAccount newsfeedDetailCommentsToAccount = NewsfeedDetailCommentsToAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -263,8 +249,7 @@ NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(
   return newsfeedDetailCommentsToAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsToAccountToJson(
-    NewsfeedDetailCommentsToAccount entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsToAccountToJson(NewsfeedDetailCommentsToAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/newsfeed_following_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/newsfeed_following_entity.dart';
 
-NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(
-    Map<String, dynamic> json) {
+NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(Map<String, dynamic> json) {
   final NewsfeedFollowingEntity newsfeedFollowingEntity = NewsfeedFollowingEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(
   if (countPage != null) {
     newsfeedFollowingEntity.countPage = countPage;
   }
-  final List<NewsfeedFollowingList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NewsfeedFollowingList>(e) as NewsfeedFollowingList)
-      .toList();
+  final List<NewsfeedFollowingList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedFollowingList>(e) as NewsfeedFollowingList).toList();
   if (list != null) {
     newsfeedFollowingEntity.list = list;
   }
   return newsfeedFollowingEntity;
 }
 
-Map<String, dynamic> $NewsfeedFollowingEntityToJson(
-    NewsfeedFollowingEntity entity) {
+Map<String, dynamic> $NewsfeedFollowingEntityToJson(NewsfeedFollowingEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -59,8 +54,7 @@ extension NewsfeedFollowingEntityExtension on NewsfeedFollowingEntity {
   }
 }
 
-NewsfeedFollowingList $NewsfeedFollowingListFromJson(
-    Map<String, dynamic> json) {
+NewsfeedFollowingList $NewsfeedFollowingListFromJson(Map<String, dynamic> json) {
   final NewsfeedFollowingList newsfeedFollowingList = NewsfeedFollowingList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -91,16 +85,14 @@ NewsfeedFollowingList $NewsfeedFollowingListFromJson(
   if (createdAt != null) {
     newsfeedFollowingList.createdAt = createdAt;
   }
-  final NewsfeedFollowingListAccount? account = jsonConvert.convert<
-      NewsfeedFollowingListAccount>(json['account']);
+  final NewsfeedFollowingListAccount? account = jsonConvert.convert<NewsfeedFollowingListAccount>(json['account']);
   if (account != null) {
     newsfeedFollowingList.account = account;
   }
   return newsfeedFollowingList;
 }
 
-Map<String, dynamic> $NewsfeedFollowingListToJson(
-    NewsfeedFollowingList entity) {
+Map<String, dynamic> $NewsfeedFollowingListToJson(NewsfeedFollowingList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;
@@ -136,8 +128,7 @@ extension NewsfeedFollowingListExtension on NewsfeedFollowingList {
   }
 }
 
-NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedFollowingListAccount newsfeedFollowingListAccount = NewsfeedFollowingListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -158,8 +149,7 @@ NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(
   return newsfeedFollowingListAccount;
 }
 
-Map<String, dynamic> $NewsfeedFollowingListAccountToJson(
-    NewsfeedFollowingListAccount entity) {
+Map<String, dynamic> $NewsfeedFollowingListAccountToJson(NewsfeedFollowingListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/newsfeed_foryou_entity.g.dart

@@ -19,11 +19,8 @@ NewsfeedForyouEntity $NewsfeedForyouEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     newsfeedForyouEntity.countPage = countPage;
   }
-  final List<NewsfeedForyouList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<NewsfeedForyouList>(e) as NewsfeedForyouList)
-      .toList();
+  final List<NewsfeedForyouList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedForyouList>(e) as NewsfeedForyouList).toList();
   if (list != null) {
     newsfeedForyouEntity.list = list;
   }
@@ -88,8 +85,7 @@ NewsfeedForyouList $NewsfeedForyouListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     newsfeedForyouList.createdAt = createdAt;
   }
-  final NewsfeedForyouListAccount? account = jsonConvert.convert<
-      NewsfeedForyouListAccount>(json['account']);
+  final NewsfeedForyouListAccount? account = jsonConvert.convert<NewsfeedForyouListAccount>(json['account']);
   if (account != null) {
     newsfeedForyouList.account = account;
   }
@@ -132,8 +128,7 @@ extension NewsfeedForyouListExtension on NewsfeedForyouList {
   }
 }
 
-NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedForyouListAccount newsfeedForyouListAccount = NewsfeedForyouListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -154,8 +149,7 @@ NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(
   return newsfeedForyouListAccount;
 }
 
-Map<String, dynamic> $NewsfeedForyouListAccountToJson(
-    NewsfeedForyouListAccount entity) {
+Map<String, dynamic> $NewsfeedForyouListAccountToJson(NewsfeedForyouListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/newsfeed_news_entity.g.dart

@@ -19,10 +19,8 @@ NewsfeedNewsEntity $NewsfeedNewsEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     newsfeedNewsEntity.countPage = countPage;
   }
-  final List<NewsfeedNewsList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<NewsfeedNewsList>(e) as NewsfeedNewsList)
-      .toList();
+  final List<NewsfeedNewsList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<NewsfeedNewsList>(e) as NewsfeedNewsList).toList();
   if (list != null) {
     newsfeedNewsEntity.list = list;
   }
@@ -87,8 +85,7 @@ NewsfeedNewsList $NewsfeedNewsListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     newsfeedNewsList.createdAt = createdAt;
   }
-  final NewsfeedNewsListAccount? account = jsonConvert.convert<
-      NewsfeedNewsListAccount>(json['account']);
+  final NewsfeedNewsListAccount? account = jsonConvert.convert<NewsfeedNewsListAccount>(json['account']);
   if (account != null) {
     newsfeedNewsList.account = account;
   }
@@ -131,8 +128,7 @@ extension NewsfeedNewsListExtension on NewsfeedNewsList {
   }
 }
 
-NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(
-    Map<String, dynamic> json) {
+NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(Map<String, dynamic> json) {
   final NewsfeedNewsListAccount newsfeedNewsListAccount = NewsfeedNewsListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -153,8 +149,7 @@ NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(
   return newsfeedNewsListAccount;
 }
 
-Map<String, dynamic> $NewsfeedNewsListAccountToJson(
-    NewsfeedNewsListAccount entity) {
+Map<String, dynamic> $NewsfeedNewsListAccountToJson(NewsfeedNewsListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

packages/cs_domain/lib/generated/json/property_news_entity.g.dart

@@ -19,10 +19,8 @@ PropertyNewsEntity $PropertyNewsEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     propertyNewsEntity.countPage = countPage;
   }
-  final List<PropertyNewsList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<PropertyNewsList>(e) as PropertyNewsList)
-      .toList();
+  final List<PropertyNewsList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PropertyNewsList>(e) as PropertyNewsList).toList();
   if (list != null) {
     propertyNewsEntity.list = list;
   }

packages/cs_domain/lib/generated/json/property_sale_rent_entity.g.dart

@@ -1,8 +1,7 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/property_sale_rent_entity.dart';
 
-PropertySaleRentEntity $PropertySaleRentEntityFromJson(
-    Map<String, dynamic> json) {
+PropertySaleRentEntity $PropertySaleRentEntityFromJson(Map<String, dynamic> json) {
   final PropertySaleRentEntity propertySaleRentEntity = PropertySaleRentEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -20,19 +19,15 @@ PropertySaleRentEntity $PropertySaleRentEntityFromJson(
   if (countPage != null) {
     propertySaleRentEntity.countPage = countPage;
   }
-  final List<PropertySaleRentList>? list = (json['list'] as List<dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<PropertySaleRentList>(e) as PropertySaleRentList)
-      .toList();
+  final List<PropertySaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<PropertySaleRentList>(e) as PropertySaleRentList).toList();
   if (list != null) {
     propertySaleRentEntity.list = list;
   }
   return propertySaleRentEntity;
 }
 
-Map<String, dynamic> $PropertySaleRentEntityToJson(
-    PropertySaleRentEntity entity) {
+Map<String, dynamic> $PropertySaleRentEntityToJson(PropertySaleRentEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

packages/cs_domain/lib/generated/json/user_me_entity.g.dart

@@ -23,13 +23,11 @@ UserMeEntity $UserMeEntityFromJson(Map<String, dynamic> json) {
   if (email != null) {
     userMeEntity.email = email;
   }
-  final String? followsCount = jsonConvert.convert<String>(
-      json['follows_count']);
+  final String? followsCount = jsonConvert.convert<String>(json['follows_count']);
   if (followsCount != null) {
     userMeEntity.followsCount = followsCount;
   }
-  final String? flowersCount = jsonConvert.convert<String>(
-      json['flowers_count']);
+  final String? flowersCount = jsonConvert.convert<String>(json['flowers_count']);
   if (flowersCount != null) {
     userMeEntity.flowersCount = flowersCount;
   }
@@ -37,28 +35,21 @@ UserMeEntity $UserMeEntityFromJson(Map<String, dynamic> json) {
   if (postsCount != null) {
     userMeEntity.postsCount = postsCount;
   }
-  final List<UserMeHouseholds>? households = (json['households'] as List<
-      dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<UserMeHouseholds>(e) as UserMeHouseholds)
-      .toList();
+  final List<UserMeHouseholds>? households = (json['households'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UserMeHouseholds>(e) as UserMeHouseholds).toList();
   if (households != null) {
     userMeEntity.households = households;
   }
-  final List<UserMeEstates>? estates = (json['estates'] as List<dynamic>?)
-      ?.map(
-          (e) => jsonConvert.convert<UserMeEstates>(e) as UserMeEstates)
-      .toList();
+  final List<UserMeEstates>? estates = (json['estates'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UserMeEstates>(e) as UserMeEstates).toList();
   if (estates != null) {
     userMeEntity.estates = estates;
   }
-  final UserMeDefaultUnit? defaultUnit = jsonConvert.convert<UserMeDefaultUnit>(
-      json['default_unit']);
+  final UserMeDefaultUnit? defaultUnit = jsonConvert.convert<UserMeDefaultUnit>(json['default_unit']);
   if (defaultUnit != null) {
     userMeEntity.defaultUnit = defaultUnit;
   }
-  final UserMeInformation? information = jsonConvert.convert<UserMeInformation>(
-      json['information']);
+  final UserMeInformation? information = jsonConvert.convert<UserMeInformation>(json['information']);
   if (information != null) {
     userMeEntity.information = information;
   }
@@ -161,12 +152,8 @@ UserMeEstates $UserMeEstatesFromJson(Map<String, dynamic> json) {
   if (name != null) {
     userMeEstates.name = name;
   }
-  final List<UserMeEstatesAccounts>? accounts = (json['accounts'] as List<
-      dynamic>?)
-      ?.map(
-          (e) =>
-      jsonConvert.convert<UserMeEstatesAccounts>(e) as UserMeEstatesAccounts)
-      .toList();
+  final List<UserMeEstatesAccounts>? accounts = (json['accounts'] as List<dynamic>?)?.map(
+          (e) => jsonConvert.convert<UserMeEstatesAccounts>(e) as UserMeEstatesAccounts).toList();
   if (accounts != null) {
     userMeEstates.accounts = accounts;
   }
@@ -194,8 +181,7 @@ extension UserMeEstatesExtension on UserMeEstates {
   }
 }
 
-UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(
-    Map<String, dynamic> json) {
+UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(Map<String, dynamic> json) {
   final UserMeEstatesAccounts userMeEstatesAccounts = UserMeEstatesAccounts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -221,16 +207,14 @@ UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(
   if (status != null) {
     userMeEstatesAccounts.status = status;
   }
-  final UserMeEstatesAccountsUnit? unit = jsonConvert.convert<
-      UserMeEstatesAccountsUnit>(json['unit']);
+  final UserMeEstatesAccountsUnit? unit = jsonConvert.convert<UserMeEstatesAccountsUnit>(json['unit']);
   if (unit != null) {
     userMeEstatesAccounts.unit = unit;
   }
   return userMeEstatesAccounts;
 }
 
-Map<String, dynamic> $UserMeEstatesAccountsToJson(
-    UserMeEstatesAccounts entity) {
+Map<String, dynamic> $UserMeEstatesAccountsToJson(UserMeEstatesAccounts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -263,8 +247,7 @@ extension UserMeEstatesAccountsExtension on UserMeEstatesAccounts {
   }
 }
 
-UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(
-    Map<String, dynamic> json) {
+UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(Map<String, dynamic> json) {
   final UserMeEstatesAccountsUnit userMeEstatesAccountsUnit = UserMeEstatesAccountsUnit();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -289,8 +272,7 @@ UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(
   return userMeEstatesAccountsUnit;
 }
 
-Map<String, dynamic> $UserMeEstatesAccountsUnitToJson(
-    UserMeEstatesAccountsUnit entity) {
+Map<String, dynamic> $UserMeEstatesAccountsUnitToJson(UserMeEstatesAccountsUnit entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['block'] = entity.block;

packages/cs_domain/lib/repository/facility_repository.dart

@@ -54,12 +54,12 @@ class FacilityRepository {
       //获取List数据 需要转换一次
       var list = jsonList
           ?.map((value) {
-            if (value is Map<String, dynamic>) {
-              return IdNameEntity.fromJson(value);
-            } else {
-              return null;
-            }
-          })
+        if (value is Map<String, dynamic>) {
+          return IdNameEntity.fromJson(value);
+        } else {
+          return null;
+        }
+      })
           .where((item) => item != null)
           .cast<IdNameEntity>()
           .toList();
@@ -97,7 +97,7 @@ class FacilityRepository {
   }
 
   /// 预约设施
-  Future<HttpResult> submitBooking({
+  Future<HttpResult<FacilityDetail>> submitBooking({
     required String? periodId,
     required DateTime date,
     CancelToken? cancelToken,
@@ -117,7 +117,9 @@ class FacilityRepository {
     );
 
     if (result.isSuccess) {
-      return result.convert();
+      final json = result.getDataJson();
+      var data = FacilityDetail.fromJson(json!);
+      return result.convert<FacilityDetail>(data: data);
     }
     return result.convert();
   }
@@ -194,4 +196,29 @@ class FacilityRepository {
     return result.convert();
   }
 
+  /// 获取预约Booking的详情
+  Future<HttpResult<FacilityDetail>> fetchFacilityBookingDetail({
+    required String? id,
+    CancelToken? cancelToken,
+  }) async {
+    Map<String, String> params = {};
+    params['id'] = id ?? "";
+
+    final result = await dioEngine.requestNetResult(
+      ApiConstants.apiFacilityBookingDetail,
+      params: params,
+      isShowLoadingDialog: true,
+      networkDebounce: true,
+      method: HttpMethod.GET,
+      cancelToken: cancelToken,
+    );
+
+    if (result.isSuccess) {
+      final json = result.getDataJson();
+      var data = FacilityDetail.fromJson(json!);
+      return result.convert<FacilityDetail>(data: data);
+    }
+    return result.convert();
+  }
+
 }

packages/cs_resources/lib/generated/intl/messages_en.dart

@@ -193,6 +193,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("HACKING START DATE"),
         "have_fun": MessageLookupByLibrary.simpleMessage("Have Fun!"),
         "history": MessageLookupByLibrary.simpleMessage("History"),
+        "hold_started_on":
+            MessageLookupByLibrary.simpleMessage("hold started on"),
         "home": MessageLookupByLibrary.simpleMessage("Home"),
         "household": MessageLookupByLibrary.simpleMessage("Household"),
         "household_members":
@@ -336,6 +338,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "registration_of_2_vehicle":
             MessageLookupByLibrary.simpleMessage("Registration of 2nd Vehicle"),
         "rejected": MessageLookupByLibrary.simpleMessage("Rejected"),
+        "released_on": MessageLookupByLibrary.simpleMessage("released on"),
         "remove": MessageLookupByLibrary.simpleMessage("Remove"),
         "remove_account":
             MessageLookupByLibrary.simpleMessage("Remove Account"),

packages/cs_resources/lib/generated/l10n.dart

@@ -2820,6 +2820,26 @@ class S {
     );
   }
 
+  /// `hold started on`
+  String get hold_started_on {
+    return Intl.message(
+      'hold started on',
+      name: 'hold_started_on',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `released on`
+  String get released_on {
+    return Intl.message(
+      'released on',
+      name: 'released_on',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Other`
   String get other {
     return Intl.message(

packages/cs_resources/lib/l10n/intl_en.arb

@@ -276,5 +276,7 @@
   "media_room": "Media Room",
   "pet_pavilion": "Pet Pavilion",
   "tennis_court": "Tennis Court",
+  "hold_started_on": "hold started on",
+  "released_on": "released on",
   "other": "Other"
 }

packages/cs_resources/lib/l10n/intl_zh_CN.arb

@@ -276,5 +276,7 @@
   "media_room": "多媒体室",
   "pet_pavilion": "宠物亭",
   "tennis_court": "网球场",
+  "hold_started_on": "押金付款于",
+  "released_on": "押金退款于",
   "other": "其他"
 }

packages/cs_resources/lib/l10n/intl_zh_HK.arb

@@ -262,5 +262,7 @@
   "media_room": "多媒体室",
   "pet_pavilion": "宠物亭",
   "tennis_court": "网球场",
+  "hold_started_on": "押金付款于",
+  "released_on": "押金退款于",
   "other": "其他"
 }