Merge branch 'v5.1.4+' into v5.1.5+

@@ -137,8 +137,8 @@ class NoteBookItemFState extends State<NoteBookItemF>
     params['note_name'] = userModel.user.account;
     params['note_name'] = userModel.user.account;
     NotebookDetailModel detailModel =
     NotebookDetailModel detailModel =
         Provider.of<NotebookDetailModel>(context, listen: false);
         Provider.of<NotebookDetailModel>(context, listen: false);
-    bool success =
-        await detailModel.setReserveStatus(context, params, ifPush: false);
+    bool success = await detailModel.setReserveStatus(context, params,
+        ifPush: false, notebook: widget.notebook);
     if (success) {
     if (success) {
       bus.emit("refresh_book_list");
       bus.emit("refresh_book_list");
       if (status == "4" && phone != null && phone != '') {
       if (status == "4" && phone != null && phone != '') {
@@ -465,7 +465,7 @@ class NoteBookItemFState extends State<NoteBookItemF>
         ? MyColours.color_438E93
         ? MyColours.color_438E93
         : MyColours.color_BFC4D4;
         : MyColours.color_BFC4D4;
 
 
-         Color roomColor = canDo &&
+    Color roomColor = canDo &&
             (Utils.getAuthority(context, '到店') ||
             (Utils.getAuthority(context, '到店') ||
                 notebook.uid == userModel.user.openid)
                 notebook.uid == userModel.user.openid)
         ? MyColours.color_438E93
         ? MyColours.color_438E93

@@ -150,7 +150,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
     NotebookDetailModel detailModel =
     NotebookDetailModel detailModel =
         Provider.of<NotebookDetailModel>(context, listen: false);
         Provider.of<NotebookDetailModel>(context, listen: false);
     bool success =
     bool success =
-        await detailModel.setReserveStatus(context, params, ifPush: false);
+        await detailModel.setReserveStatus(context, params, ifPush: false,notebook: widget.notebook);
     if (success) {
     if (success) {
       bus.emit("refresh_book_list");
       bus.emit("refresh_book_list");
       if (status == "4" && phone != null && phone != '') {
       if (status == "4" && phone != null && phone != '') {

@@ -12,8 +12,10 @@ import 'package:one_key/net/http_url.dart';
 import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/route/navigator_util.dart';
 import 'package:one_key/route/navigator_util.dart';
 import 'package:one_key/utils/utils.dart';
 import 'package:one_key/utils/utils.dart';
+import 'package:one_key/widgets/loading.dart';
 import 'package:provider/provider.dart';
 import 'package:provider/provider.dart';
 
 
+import '../models/notebook.dart';
 import '../models/reserve_deposit_model.dart';
 import '../models/reserve_deposit_model.dart';
 import '../models/reserve_recheck_model.dart';
 import '../models/reserve_recheck_model.dart';
 
 
@@ -270,27 +272,60 @@ class NotebookDetailModel extends ChangeNotifier {
   //安排在线预订
   //安排在线预订
   Future<bool> setReserveStatus(
   Future<bool> setReserveStatus(
       BuildContext context, Map<String, String> params,
       BuildContext context, Map<String, String> params,
-      {ifPush = true, showLoading = false}) async {
-    BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
-        .request<Map<String, dynamic>>(
-            context, Method.get, HttpUrl.set_reserve_status,
-            data: params, showLoading: showLoading)
-        .catchError((error) {
-      print(error.toString());
-    });
-    if (baseResp == null) return false;
-    if (baseResp.code == Constant.status_success && baseResp.data != null) {
-      if (ifPush) {
-        UserModel userModel = Provider.of<UserModel>(context, listen: false);
-        NavigatorUtil.goNotebookDetailPage(
-            context, params["rid"], userModel.user.openid,
-            replace: true);
+      {ifPush = true, showLoading = false, Notebook notebook}) async {
+    ////到店  2 离店 3
+    ///
+    ///
+    bool can = true;
+    if (params['status'] == '2') {
+      //到店操作,限制在就餐前一小时之后
+      //  订单就餐时间
+      DateTime dateTime =
+          DateTime.fromMillisecondsSinceEpoch(int.parse(notebook.ddate) * 1000);
+
+      //     // 现在的时间
+      //  DateTime
+      DateTime now = DateTime.now();
+      // DateTime now = DateTime.fromMillisecondsSinceEpoch(1703905139 * 1000);
+      var difference = dateTime.difference(now);
+
+      print(difference.inMinutes > 60);
+      if (difference.inMinutes > 60) {
+        Utils.showToast('当前预订不能点击到店，因为还没到临餐时间!');
+        can = false;
+        Loading.hideLoading(context);
+      }
+    } else if (params['status'] == '3') {
+      //离店操作,需要订单已经是到店状态
+      if (notebook.status != '2') {
+        Utils.showToast('当前订单不能点击离店，需要先做到店确认!');
+        can = false;
+        Loading.hideLoading(context);
       }
       }
-      return true;
-    } else {
-      Utils.showToast("订单已被处理");
-      return false;
     }
     }
+    if (can) {
+      BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
+          .request<Map<String, dynamic>>(
+              context, Method.get, HttpUrl.set_reserve_status,
+              data: params, showLoading: showLoading)
+          .catchError((error) {
+        print(error.toString());
+      });
+      if (baseResp == null) return false;
+      if (baseResp.code == Constant.status_success && baseResp.data != null) {
+        if (ifPush) {
+          UserModel userModel = Provider.of<UserModel>(context, listen: false);
+          NavigatorUtil.goNotebookDetailPage(
+              context, params["rid"], userModel.user.openid,
+              replace: true);
+        }
+        return true;
+      } else {
+        Utils.showToast("订单已被处理");
+        return false;
+      }
+    }
+    return false;
   }
   }
 
 
   //设置消息状态
   //设置消息状态