桌位管理

gaiyaguang
1 parent bb653f4f
Showing 8 changed files with 166 additions and 84 deletions
android/app/build.gradle
lib/models/notebook_detail.dart
lib/net/http_url.dart
lib/pages/detail/notebook_detail_change_page.dart
lib/pages/table/table_manager_page.dart
lib/provider/notebook_detail_change_model.dart
lib/provider/table_manager_model.dart
lib/widgets/table_item.dart
--- a/android/app/build.gradle
View file @8e9171c
+++ b/android/app/build.gradle
View file @8e9171c
@@ -11,14 +11,14 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
-def flutterVersionCode = "121"
+def flutterVersionCode = "132"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '131'
+    flutterVersionCode = '132'
 }
-def flutterVersionName = "1.2.1"
+def flutterVersionName = "1.3.2"
 if (flutterVersionName == null) {
-    flutterVersionName = '1.3.1'
+    flutterVersionName = '1.3.2'
 }
 apply plugin: 'com.android.application'
--- a/lib/models/notebook_detail.dart
View file @8e9171c
+++ b/lib/models/notebook_detail.dart
View file @8e9171c
@@ -27,7 +27,7 @@ class NotebookDetail {
     tables=[];
   }
-  NotebookDetail.fromTableManager(DateTime dateTime,String ddate_solt,t.Table table){
+  NotebookDetail.fromTableManager(DateTime dateTime,String ddatesolt,t.Table table){
     id="-1";
     pnum="6";
     rname="";
@@ -35,7 +35,7 @@ class NotebookDetail {
     phone="";
     cusdem="";
     ddate=(DateUtil.getDateMsByTimeStr(DateUtil.formatDate(dateTime).replaceRange(11,19, "00:00:00"))/1000).floor().toString();
-    ddate_solt=ddate_solt;
+    ddate_solt=ddatesolt;
     is_set_ddate="0";
     tables=[table];
   }
--- a/lib/net/http_url.dart
View file @8e9171c
+++ b/lib/net/http_url.dart
View file @8e9171c
@@ -32,7 +32,7 @@ class HttpUrl {
   static const String get_table_list =
       "?service=Android.Reserve.NewGetTableList"; //根据商家ID 获取桌位信息列表： 1：散座 2：包间 默认：获取所有数据
   static const String set_reserve_info =
-      "?service=Android.Customer.SetReserveInfo"; //录入顾客订座相关信息，同时更新商家桌位状态
+      "?service=Android.Reserve.SetReserveInfo"; //录入顾客订座相关信息，同时更新商家桌位状态
   static const String set_switch_status =
       "?service=App.Reserve.SetSwitchStatus"; //启用/停用桌位
 }
--- a/lib/pages/detail/notebook_detail_change_page.dart
View file @8e9171c
+++ b/lib/pages/detail/notebook_detail_change_page.dart
View file @8e9171c
@@ -820,9 +820,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
                       NavigatorUtil.goInvicationPage(context, _model.row.id,
                           _nameStr, _model.row.ddate, ddate_solt,
                           replace: true);
-                      if(widget.detailEntity.id=="-1"){
-                        EventBus().emit("refresh_tablemanager");
-                      }
+                      EventBus().emit("refresh_tablemanager");//刷新桌位
                     } else {
                       Utils.showToast(widget.detailEntity.id=="-1"?"变更预订订单失败，请重试！":"变更预订订单失败，请重试！");
                     }
--- a/lib/pages/table/table_manager_page.dart
View file @8e9171c
+++ b/lib/pages/table/table_manager_page.dart
View file @8e9171c
-import 'dart:ffi';
-
 import 'package:common_utils/common_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:one_key/constant/state.dart';
 import 'package:one_key/models/area.dart';
-import 'package:one_key/models/notebook.dart';
 import 'package:one_key/models/notebook_detail.dart';
-import 'package:one_key/models/tableOuter.dart';
-import 'package:one_key/models/table_list.dart';
-import 'package:one_key/provider/choose_table_model.dart';
-import 'package:one_key/provider/notebook_detail_change_model.dart';
-import 'package:one_key/provider/notebook_model.dart';
 import 'package:one_key/provider/table_manager_model.dart';
-import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/res/colors.dart';
 import 'package:one_key/utils/dialog_util.dart';
 import 'package:one_key/utils/event_bus.dart';
 import 'package:one_key/utils/navigator_util.dart';
-import 'package:one_key/utils/utils.dart';
 import 'package:one_key/widgets/MyDivider.dart';
 import 'package:one_key/widgets/app_bar.dart';
 import 'package:one_key/widgets/area_item.dart';
 import 'package:one_key/widgets/common_button.dart';
+import 'package:one_key/widgets/page_exception.dart';
 import 'package:one_key/widgets/table_item.dart';
 import 'package:one_key/models/table.dart' as t;
 import 'package:provider/provider.dart';
@@ -64,7 +56,7 @@ class TableManagerPageState extends State<TableManagerPage> {
             children: <Widget>[
               MyAppBar(
                 "桌位",
-                showBack: true,
+                showBack: false
               ),
               Container(
                 color: MyColours.color_ffffff,
@@ -167,18 +159,43 @@ class TableManagerPageState extends State<TableManagerPage> {
                   ],
                 ),
               ),
+              Container(
+                height: ScreenUtil().setWidth(20),
+                width: double.infinity,
+                color: MyColours.color_f5f5f5,
+              ),
               Expanded(
-                child: Container(
-                  color: MyColours.color_ffffff,
-                  child: Row(
-                    children: <Widget>[
-                      Container(
-                        width: ScreenUtil().setWidth(170),
-                        height: double.infinity,
-                        color: MyColours.color_f1f1f1,
-                        child: ListView.builder(
-                          itemBuilder: (context, index) {
-                            return AreaItem(tableManagerModel.areas[index], tableManagerModel.currentArea,
+                child: Consumer<TableManagerModel>(
+          builder: (context,model,child){
+          if (model.pageState != PageState.Success) {
+          return ExceptionPage(
+          pageState: model.pageState,
+          callback: () {
+            if(tableManagerModel.tableOuterList.isEmpty){
+              tableManagerModel.getTableList(context);
+            }else{
+              tableManagerModel.getReserveList(context);
+            }
+          },
+          emptyMsg: "暂时没有桌位哦",
+          emptyImg: "empty_search",
+          showMsg: "加载中，请稍后...",
+          );
+          }else{
+            return Container(
+              color: MyColours.color_ffffff,
+              child: Row(
+                children: <Widget>[
+                  Container(
+                    width: ScreenUtil().setWidth(170),
+                    height: double.infinity,
+                    color: MyColours.color_f1f1f1,
+                    child: ListView.builder(
+                      itemBuilder: (context, index) {
+                        return Selector<TableManagerModel,Area>(
+                          selector: (context,model)=>model.areas[index],
+                          builder: (context,area,_){
+                            return AreaItem(area, tableManagerModel.currentArea,
                                     (area) {
                                   setState(() {
                                     tableManagerModel.currentArea = (area as Area).name;
@@ -186,26 +203,31 @@ class TableManagerPageState extends State<TableManagerPage> {
                                   });
                                 });
                           },
-                          itemExtent: ScreenUtil().setHeight(207),
-                          itemCount: tableManagerModel.areas.length,
-                        ),
-                      ),
-                      Expanded(
-                        child: Padding(
-                            padding: EdgeInsets.symmetric(
-                                vertical: ScreenUtil().setHeight(10),
-                                horizontal: ScreenUtil().setWidth(9)),
-                            child: Column(
-                              children: [
-                                Expanded(
-                                    child: GridView.builder(
-                                      gridDelegate:
-                                      SliverGridDelegateWithFixedCrossAxisCount(
-                                          crossAxisCount: 3,
-                                          childAspectRatio: 8 / 9),
-                                      itemBuilder: (context, index) {
+                        );
+                      },
+                      itemExtent: ScreenUtil().setHeight(207),
+                      itemCount: tableManagerModel.areas.length,
+                    ),
+                  ),
+                  Expanded(
+                    child: Padding(
+                        padding: EdgeInsets.symmetric(
+                            vertical: ScreenUtil().setHeight(10),
+                            horizontal: ScreenUtil().setWidth(9)),
+                        child: Column(
+                          children: [
+                            Expanded(
+                                child: GridView.builder(
+                                  gridDelegate:
+                                  SliverGridDelegateWithFixedCrossAxisCount(
+                                      crossAxisCount: 3,
+                                      childAspectRatio: 8 / 9),
+                                  itemBuilder: (context, index) {
+                                    return Selector<TableManagerModel,t.Table>(
+                                      selector: (context,model)=>model.currentTables[index],
+                                      builder: (context,table,_){
                                         return TableItem(
-                                            tableManagerModel.areaTableMap[tableManagerModel.currentArea][index],
+                                            table,
                                             onSelected: (table) {
                                               if ((table as t.Table).selected) {
                                                 tableManagerModel.selectTables.add(table);
@@ -223,11 +245,35 @@ class TableManagerPageState extends State<TableManagerPage> {
                                                       NavigatorUtil.goNoteBookChangePage(context, NotebookDetail.fromTableManager(tableManagerModel.dateTime, tableManagerModel.currTimeIndex.toString(),table), "");
                                                       break;
                                                     case 3://停用，启用桌位
-                                                      Map params={
-                                                        "id":table.id,
-                                                        "status":table.enable=="1"?"0":"1"
+                                                      Map<String,String> params={
+                                                        "id":(table as t.Table).id,
+                                                        "status":(table as t.Table).enable=="1"?"0":"1"
                                                       };
-                                                      tableManagerModel.setSwitchStatus(context, params);
+                                                      tableManagerModel.setSwitchStatus(context, params).then((value){
+                                                        if(value!=null){
+                                                          (table as t.Table).enable=((int.parse((table as t.Table).enable)+1)%2).toString();
+                                                          if((table as t.Table).enable=="1"){
+                                                            for(Area area in tableManagerModel.areas){
+                                                              if(area.name==tableManagerModel.currentArea){
+                                                                if(table.sign != '5'&&table.sign != '1'){//已预订
+                                                                  area.count++;
+                                                                }
+                                                                break;
+                                                              }
+                                                            }
+                                                          }else{
+                                                            for(Area area in tableManagerModel.areas){
+                                                              if(area.name==tableManagerModel.currentArea){
+                                                                if(table.sign != '5'&&table.sign != '1'){//已预订
+                                                                  area.count--;
+                                                                }
+                                                                break;
+                                                              }
+                                                            }
+                                                          }
+                                                          tableManagerModel.notifyListeners();
+                                                        }
+                                                      });
                                                       break;
                                                   }
                                                 }
@@ -238,14 +284,19 @@ class TableManagerPageState extends State<TableManagerPage> {
                                             tableMap: tableManagerModel.tableMap,
                                             rid: "");
                                       },
-                                      itemCount: tableManagerModel.areaTableMap[tableManagerModel.currentArea].length,
-                                    )),
-                              ],
-                            )),
-                      )
-                    ],
-                  ),
-                ),
+                                    );
+                                  },
+                                  itemCount: tableManagerModel.currentTables.length,
+                                )),
+                          ],
+                        )),
+                  )
+                ],
+              ),
+            );
+          }
+          },
+          ),
               ),
             ],
           );
--- a/lib/provider/notebook_detail_change_model.dart
View file @8e9171c
+++ b/lib/provider/notebook_detail_change_model.dart
View file @8e9171c
@@ -357,11 +357,13 @@ class NotebookDetailChangeModel with ChangeNotifier {
     UserModel userModel = Provider.of<UserModel>(context, listen: false);
     Map<String, String> params = {
       "sid": userModel.user.sellerid,
-      "rid": detailEntity.id,
       "rdate": rdate,
       'ddate_solt': ddate_solt,
       'pnum': pnum
     };
+    if(detailEntity.id.isNotEmpty&&detailEntity.id!="-1"){
+      params['rid']=detailEntity.id;
+    }
     BaseResp<dynamic> baseResp = await DioUtil()
         .request<dynamic>(context, Method.get, HttpUrl.get_table_list,
             data: params)
@@ -543,7 +545,6 @@ class NotebookDetailChangeModel with ChangeNotifier {
     }
     Map<String, String> params = {
       'is_set_ddate': isSetDate,
-      "rid": detailEntity.id, //变更订单必传预定ID
       "sid": userModel.user.sellerid, //商家ID
       "tid": tableSelectInfo, //桌子ID: 格式 2,3,4
       "pnum": pnum, //预定用餐人数
@@ -555,6 +556,9 @@ class NotebookDetailChangeModel with ChangeNotifier {
       "ddate": '${ddate}'.substring(0, 10), //到店时间
       "ddate_solt": ddateSolt
     };
+    if(detailEntity.id.isNotEmpty&&detailEntity.id!="-1"){
+      params['rid']=detailEntity.id;
+    }
     print(params);
     BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
         .request<Map<String, dynamic>>(
@@ -574,7 +578,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
           baseResp.responseData['data']['row'] != null) {
         itemModel = ReserveInfoModel.fromJson(baseResp.responseData).data;
       } else {
-        Utils.showToast(baseResp.msg ?? "变更预订失败，请重试");
+        Utils.showToast(baseResp.msg ?? detailEntity.id=="-1"?"变更预订订单失败，请重试！":"变更预订订单失败，请重试！");
       }
       return itemModel;
     }
--- a/lib/provider/table_manager_model.dart
View file @8e9171c
+++ b/lib/provider/table_manager_model.dart
View file @8e9171c
+
+
+import 'package:common_utils/common_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:one_key/constant/constant.dart';
+import 'package:one_key/constant/error.dart';
+import 'package:one_key/constant/state.dart';
 import 'package:one_key/models/area.dart';
 import 'package:one_key/models/notebook.dart';
 import 'package:one_key/models/tableOuter.dart';
@@ -25,8 +30,6 @@ class TableManagerModel with ChangeNotifier{
   Map<String, List<t.Table>> areaTableMap = {}; //区域-桌位Map
   List<t.Table> currentTables=[];//当前显示的区域-桌位
-  TableManagerModel tableManagerModel;
-
   Map<String, Notebook> tableMap = {}; //记录已预订桌位对应的订单
   String currentArea; //当前选中区域
@@ -40,6 +43,8 @@ class TableManagerModel with ChangeNotifier{
   String night; //晚市时间段
   UserModel userModel;
+  PageState pageState = PageState.Loading;
+
   //初始化时间
   initTime(BuildContext context) async {
     userModel = Provider.of<UserModel>(context, listen: false);
@@ -103,21 +108,42 @@ class TableManagerModel with ChangeNotifier{
       //过了晚市
       currTimeIndex = 3;
     }
-    Map<String, String> params = {"sellerid": userModel.user.sellerid};
-    tableOuterList = await tableManagerModel.getTableList(context, params);
+    await getTableList(context);
     getReserveList(context);
   }
   //获取桌位数据
-  Future<List<TableOuter>> getTableList(BuildContext context,Map<String,String> params) async {
+  Future<List<TableOuter>> getTableList(BuildContext context) async {
+    pageState = PageState.Loading;
+    notifyListeners();
+    Map<String, String> params = {"sellerid": userModel.user.sellerid};
     BaseResp<List> baseResp = await DioUtil()
         .request<List>(context, Method.get, HttpUrl.table_list,
-        data: params,showLoading: true)
+        data: params,showLoading: false)
         .catchError((error) {
       print(error.toString());
+      if (error is MyError) {
+        switch (error.type) {
+          case 1:
+            pageState = PageState.ConnectivityError;
+            break;
+          case 2:
+            pageState = PageState.ConnectivityTimeOut;
+            break;
+          default:
+            pageState = PageState.ConnectivityError;
+            break;
+        }
+      }
+      notifyListeners();
     });
+    tableOuterList=[];
     if(baseResp.code==Constant.status_success){
-      return (baseResp.data[0] as List).map((value){
+      if ((baseResp.data[0] as List).isEmpty) {
+        pageState = PageState.Empty;
+        notifyListeners();
+      }
+      tableOuterList=(baseResp.data[0] as List).map((value){
         TableOuter tableOuter=TableOuter();
         tableOuter.name=value["name"];
         tableOuter.list=(value["list"] as List).map((table){
@@ -126,11 +152,12 @@ class TableManagerModel with ChangeNotifier{
         return tableOuter;
       }).toList();
     }
-    return [];
+    return tableOuterList;
   }
   //获取已预订列表
   getReserveList(BuildContext context) async {
+    tableMap.clear();
     NoteBookModel model = new NoteBookModel();
     Map<String, String> params = {
       "sid": userModel.user.sellerid,
@@ -141,6 +168,8 @@ class TableManagerModel with ChangeNotifier{
       "keywords": "",
       "sort": "1"
     };
+    pageState = PageState.Loading;
+    notifyListeners();
     List<Notebook> noteBooks = await model.getReserveList(context, params);
     for (Notebook notebook in noteBooks) {
       if (notebook.tid.isEmpty) continue;
@@ -214,8 +243,9 @@ class TableManagerModel with ChangeNotifier{
       areas.add(area);
     }
     currentArea = areaTableMap.keys.first;
-    currentTables=areaTableMap[tableManagerModel.currentArea];
-    notifyListeners();
+    currentTables=areaTableMap[currentArea];
+    pageState = PageState.Success;
+    notifyListeners();;
   }
   //生成日期文本
@@ -242,7 +272,7 @@ class TableManagerModel with ChangeNotifier{
   //获取桌位数据
   Future<dynamic> setSwitchStatus(BuildContext context,Map<String,String> params) async {
     BaseResp<dynamic> baseResp = await DioUtil()
-        .request<List>(context, Method.get, HttpUrl.set_switch_status,
+        .request<dynamic>(context, Method.get, HttpUrl.set_switch_status,
         data: params,showLoading: true)
         .catchError((error) {
       print(error.toString());
--- a/lib/widgets/table_item.dart
View file @8e9171c
+++ b/lib/widgets/table_item.dart
View file @8e9171c
@@ -228,13 +228,12 @@ class TableItemState extends State<TableItem> {
           Positioned(
               top: 3,
               right: 5,
-              child: !(table.selected ?? false)
-                  ? Container()
-                  : Image.asset(
-                      "assets/icon_selected.png",
-                      width: ScreenUtil().setWidth(40),
-                      height: ScreenUtil().setWidth(40),
-                    ))
+              child: widget.canSelected&&(table.selected ?? false)
+                  ? Image.asset(
+                "assets/icon_selected.png",
+                width: ScreenUtil().setWidth(40),
+                height: ScreenUtil().setWidth(40),
+              ):Container())
         ],
       ),
     );