xt / Flutter-ReserveApp · Commits

Go to a project

Commit b0cda2c4dd1dfaa6297beae5be87327bc1740b38

Authored by wdn127929
1 parent 893b0a2d
build: skipped

已预订列表展示核餐结果&删除订金权限（自己录入的可以删除）

Inline Side-by-side
Showing 8 changed files with 117 additions and 63 deletions
1 import 'dart:convert'; 1 import 'dart:convert';
2 2
3 import 'package:json_annotation/json_annotation.dart'; 3 import 'package:json_annotation/json_annotation.dart';
  4 +import 'package:one_key/models/reserve_recheck_model.dart';
4 import 'package:one_key/utils/utils.dart'; 5 import 'package:one_key/utils/utils.dart';
5 part 'notebook.g.dart'; 6 part 'notebook.g.dart';
6 7
@@ -59,6 +60,8 @@ class Notebook { @@ -59,6 +60,8 @@ class Notebook {
59 bool large = false; 60 bool large = false;
60 String place_order_name; //下单人 61 String place_order_name; //下单人
61 62
  63 + List<ReserveRecheckSunModel> reserveRecheckType;
  64 +
62 // String get tableinfoStr { 65 // String get tableinfoStr {
63 // return name + 66 // return name +
64 // "\n" + 67 // "\n" +
@@ -134,10 +137,14 @@ class Notebook { @@ -134,10 +137,14 @@ class Notebook {
134 } 137 }
135 138
136 String get operationText { 139 String get operationText {
  140 + String type;
  141 + if (reserveRecheckType != null && reserveRecheckType.length > 0) {
  142 + type = reserveRecheckType.last.typeShow;
  143 + }
137 switch (status) { 144 switch (status) {
138 //订单状态 0：待确认，1：已定座，2：确认到店，3：用餐完成，4：取消预订 145 //订单状态 0：待确认，1：已定座，2：确认到店，3：用餐完成，4：取消预订
139 case "1": 146 case "1":
140 - return ""; 147 + return type ?? "";
141 case "2": 148 case "2":
142 return "已到店"; 149 return "已到店";
143 case "3": 150 case "3":
@@ -145,9 +152,9 @@ class Notebook { @@ -145,9 +152,9 @@ class Notebook {
145 case "4": 152 case "4":
146 return "已取消"; 153 return "已取消";
147 case "6": 154 case "6":
148 - return ""; 155 + return type ?? "";
149 default: 156 default:
150 - return ""; 157 + return type ?? "";
151 } 158 }
152 } 159 }
153 160
@@ -7,6 +7,14 @@ part of 'notebook.dart'; @@ -7,6 +7,14 @@ part of 'notebook.dart';
7 // ************************************************************************** 7 // **************************************************************************
8 8
9 Notebook _$NotebookFromJson(Map<String, dynamic> json) { 9 Notebook _$NotebookFromJson(Map<String, dynamic> json) {
  10 + List reserveR = json['reserve_recheck_type'];
  11 + List<ReserveRecheckSunModel> data = [];
  12 + if (reserveR != null && reserveR.length > 0) {
  13 + data = <ReserveRecheckSunModel>[];
  14 + json['reserve_recheck_type'].forEach((v) {
  15 + data.add(new ReserveRecheckSunModel.fromJson(v));
  16 + });
  17 + }
10 return Notebook() 18 return Notebook()
11 ..tableinfo = json['tableinfo'] as String 19 ..tableinfo = json['tableinfo'] as String
12 ..id = json['id'] as String 20 ..id = json['id'] as String
@@ -54,7 +62,8 @@ Notebook _$NotebookFromJson(Map<String, dynamic> json) { @@ -54,7 +62,8 @@ Notebook _$NotebookFromJson(Map<String, dynamic> json) {
54 ..orderInfo = json['order_info'] == null 62 ..orderInfo = json['order_info'] == null
55 ? null 63 ? null
56 : OrderInfo.fromJson(json['order_info'] as Map<String, dynamic>) 64 : OrderInfo.fromJson(json['order_info'] as Map<String, dynamic>)
57 - ..place_order_name = json['place_order_name'] ?? ''; 65 + ..place_order_name = json['place_order_name'] ?? ''
  66 + ..reserveRecheckType = data;
58 } 67 }
59 68
60 Map<String, dynamic> _$NotebookToJson(Notebook instance) => <String, dynamic>{ 69 Map<String, dynamic> _$NotebookToJson(Notebook instance) => <String, dynamic>{
@@ -41,6 +41,8 @@ class ReserveDepositSunModel { @@ -41,6 +41,8 @@ class ReserveDepositSunModel {
41 String cdate; 41 String cdate;
42 String nickName; 42 String nickName;
43 43
  44 + String insertUid;
  45 +
44 String get payTimeStr { 46 String get payTimeStr {
45 if (payTime.toString() == '0') { 47 if (payTime.toString() == '0') {
46 return ''; 48 return '';
@@ -60,7 +62,8 @@ class ReserveDepositSunModel { @@ -60,7 +62,8 @@ class ReserveDepositSunModel {
60 this.payType, 62 this.payType,
61 this.payNo, 63 this.payNo,
62 this.cdate, 64 this.cdate,
63 - this.nickName}); 65 + this.nickName,
  66 + this.insertUid});
64 67
65 ReserveDepositSunModel.fromJson(Map<String, dynamic> json) { 68 ReserveDepositSunModel.fromJson(Map<String, dynamic> json) {
66 id = json['id']; 69 id = json['id'];
@@ -73,6 +76,7 @@ class ReserveDepositSunModel { @@ -73,6 +76,7 @@ class ReserveDepositSunModel {
73 payNo = json['pay_no']; 76 payNo = json['pay_no'];
74 cdate = json['cdate']; 77 cdate = json['cdate'];
75 nickName = json['nick_name'] ?? ''; 78 nickName = json['nick_name'] ?? '';
  79 + insertUid = json['insert_uid'];
76 } 80 }
77 81
78 Map<String, dynamic> toJson() { 82 Map<String, dynamic> toJson() {
@@ -87,6 +91,8 @@ class ReserveDepositSunModel { @@ -87,6 +91,8 @@ class ReserveDepositSunModel {
87 data['pay_no'] = this.payNo; 91 data['pay_no'] = this.payNo;
88 data['cdate'] = this.cdate; 92 data['cdate'] = this.cdate;
89 data['nick_name'] = this.nickName; 93 data['nick_name'] = this.nickName;
  94 +
  95 + data['insert_uid'] = this.insertUid;
90 return data; 96 return data;
91 } 97 }
92 } 98 }
@@ -177,7 +177,8 @@ class _BookDepositPageState extends State<BookDepositPage> { @@ -177,7 +177,8 @@ class _BookDepositPageState extends State<BookDepositPage> {
177 .toString(), 177 .toString(),
178 'pay_type': payTypeIndex == null ? null : payType[payTypeIndex], 178 'pay_type': payTypeIndex == null ? null : payType[payTypeIndex],
179 179
180 - 'pay_no': receiptNumberC.text 180 + 'pay_no': receiptNumberC.text,
  181 + 'insert_uid':Provider.of<UserModel>(context,listen: false).user.openid
181 }; 182 };
182 print(feastModel.sellerManageList[collectionPIndex].title); 183 print(feastModel.sellerManageList[collectionPIndex].title);
183 bool success = await detailModel.createReserveDeposit(context, pramas); 184 bool success = await detailModel.createReserveDeposit(context, pramas);
@@ -1440,22 +1440,26 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1440,22 +1440,26 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1440 color: MyColours.color_515151, 1440 color: MyColours.color_515151,
1441 fontSize: font(14)), 1441 fontSize: font(14)),
1442 ), 1442 ),
1443 - InkWell(  
1444 - onTap: () {  
1445 - //弹框确认是否删除  
1446 - DialogUtil.cupertinoAlertDialog(context,  
1447 - title: "",  
1448 - content: "是否确定删除?",  
1449 - isBoldContent: true,  
1450 - contentColor: MyColours.color_E6000000,  
1451 - rTitle: "删除", rCallback: () {  
1452 - _delReserveDepositByid(data.id);  
1453 - });  
1454 - },  
1455 - child: Image.asset(  
1456 - Utils.getImgPath('delete_g'),  
1457 - width: w(20),  
1458 - )) 1443 + if (Provider.of<UserModel>(context, listen: false)
  1444 + .user
  1445 + .openid ==
  1446 + data.insertUid)
  1447 + InkWell(
  1448 + onTap: () {
  1449 + //弹框确认是否删除
  1450 + DialogUtil.cupertinoAlertDialog(context,
  1451 + title: "",
  1452 + content: "是否确定删除?",
  1453 + isBoldContent: true,
  1454 + contentColor: MyColours.color_E6000000,
  1455 + rTitle: "删除", rCallback: () {
  1456 + _delReserveDepositByid(data.id);
  1457 + });
  1458 + },
  1459 + child: Image.asset(
  1460 + Utils.getImgPath('delete_g'),
  1461 + width: w(20),
  1462 + ))
1459 ], 1463 ],
1460 ), 1464 ),
1461 ), 1465 ),
@@ -3481,46 +3485,44 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -3481,46 +3485,44 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
3481 // ), 3485 // ),
3482 // ), 3486 // ),
3483 // )), 3487 // )),
3484 - if( detailEntity.order.cookbooklist  
3485 - .length >  
3486 - 0)  
3487 - Expanded(  
3488 - flex: 1,  
3489 - child: InkWell(  
3490 - onTap: () {  
3491 - NavigatorUtil  
3492 - .goHasOrderFoodPage(  
3493 - context,  
3494 - rid: detailEntity  
3495 - .id);  
3496 - },  
3497 - child: Container(  
3498 - margin: EdgeInsets.only(  
3499 - left: ScreenUtil()  
3500 - .setWidth(20)),  
3501 - decoration: BoxDecoration(  
3502 - color: MyColours  
3503 - .color_199095,  
3504 - borderRadius:  
3505 - BorderRadius.circular(  
3506 - ScreenUtil()  
3507 - .setWidth(  
3508 - 10)),  
3509 - ),  
3510 - child: Align(  
3511 - alignment:  
3512 - Alignment.center,  
3513 - child: Text('查看菜品',  
3514 - style: TextStyle(  
3515 - color: MyColours  
3516 - .color_ffffff,  
3517 - fontSize:  
3518 - ScreenUtil()  
3519 - .setSp(  
3520 - 34))),  
3521 - ), 3488 + if (detailEntity
  3489 + .order.cookbooklist.length >
  3490 + 0)
  3491 + Expanded(
  3492 + flex: 1,
  3493 + child: InkWell(
  3494 + onTap: () {
  3495 + NavigatorUtil
  3496 + .goHasOrderFoodPage(
  3497 + context,
  3498 + rid: detailEntity
  3499 + .id);
  3500 + },
  3501 + child: Container(
  3502 + margin: EdgeInsets.only(
  3503 + left: ScreenUtil()
  3504 + .setWidth(20)),
  3505 + decoration: BoxDecoration(
  3506 + color: MyColours
  3507 + .color_199095,
  3508 + borderRadius: BorderRadius
  3509 + .circular(ScreenUtil()
  3510 + .setWidth(10)),
  3511 + ),
  3512 + child: Align(
  3513 + alignment:
  3514 + Alignment.center,
  3515 + child: Text('查看菜品',
  3516 + style: TextStyle(
  3517 + color: MyColours
  3518 + .color_ffffff,
  3519 + fontSize:
  3520 + ScreenUtil()
  3521 + .setSp(
  3522 + 34))),
3522 ), 3523 ),
3523 - )), 3524 + ),
  3525 + )),
3524 // _cancelAndChangeBtn(() { 3526 // _cancelAndChangeBtn(() {
3525 // DialogUtil 3527 // DialogUtil
3526 // .showShareDialog( 3528 // .showShareDialog(
@@ -78,6 +78,7 @@ class _VerifyFoodPageState extends State<VerifyFoodPage> { @@ -78,6 +78,7 @@ class _VerifyFoodPageState extends State<VerifyFoodPage> {
78 Utils.showToast('保存成功'); 78 Utils.showToast('保存成功');
79 79
80 bus.emit('refresh_detail_reserve_recheck'); 80 bus.emit('refresh_detail_reserve_recheck');
  81 + bus.emit('refresh_book_list');
81 Navigator.pop(context); 82 Navigator.pop(context);
82 } 83 }
83 } 84 }
@@ -465,6 +465,20 @@ class NoteBookItemFState extends State<NoteBookItemF> @@ -465,6 +465,20 @@ class NoteBookItemFState extends State<NoteBookItemF>
465 ? MyColours.color_438E93 465 ? MyColours.color_438E93
466 : MyColours.color_BFC4D4; 466 : MyColours.color_BFC4D4;
467 467
  468 + Color roomColor = canDo &&
  469 + (Utils.getAuthority(context, '到店') ||
  470 + notebook.uid == userModel.user.openid)
  471 + ? MyColours.color_438E93
  472 + : MyColours.color_BFC4D4;
  473 +
  474 + if (notebook.operationText == '未接通') {
  475 + bgColor = MyColours.color_F78D94;
  476 + } else if (notebook.operationText == '待定') {
  477 + bgColor = MyColours.color_F2995F;
  478 + } else if (notebook.operationText == '已确认') {
  479 + bgColor = MyColours.color_8EBBBE;
  480 + }
  481 +
468 String detail = ''; 482 String detail = '';
469 if (notebook.tid.split(",").length >= 2) { 483 if (notebook.tid.split(",").length >= 2) {
470 //连台 484 //连台
@@ -529,7 +543,7 @@ class NoteBookItemFState extends State<NoteBookItemF> @@ -529,7 +543,7 @@ class NoteBookItemFState extends State<NoteBookItemF>
529 maxLines: 1, 543 maxLines: 1,
530 overflow: TextOverflow.ellipsis, 544 overflow: TextOverflow.ellipsis,
531 style: TextStyle( 545 style: TextStyle(
532 - color: bgColor, 546 + color: roomColor,
533 fontWeight: FontWeight.bold, 547 fontWeight: FontWeight.bold,
534 fontSize: ScreenUtil().setSp(32)), 548 fontSize: ScreenUtil().setSp(32)),
535 ), 549 ),
@@ -475,6 +475,20 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple> @@ -475,6 +475,20 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
475 ? MyColours.color_438E93 475 ? MyColours.color_438E93
476 : MyColours.color_BFC4D4; 476 : MyColours.color_BFC4D4;
477 477
  478 + Color roomColor = canDo &&
  479 + (Utils.getAuthority(context, '到店') ||
  480 + notebook.uid == userModel.user.openid)
  481 + ? MyColours.color_438E93
  482 + : MyColours.color_BFC4D4;
  483 +
  484 + if (notebook.operationText == '未接通') {
  485 + bgColor = MyColours.color_F78D94;
  486 + } else if (notebook.operationText == '待定') {
  487 + bgColor = MyColours.color_F2995F;
  488 + } else if (notebook.operationText == '已确认') {
  489 + bgColor = MyColours.color_8EBBBE;
  490 + }
  491 +
478 String detail = ''; 492 String detail = '';
479 if (notebook.tid.split(",").length >= 2) { 493 if (notebook.tid.split(",").length >= 2) {
480 //连台 494 //连台
@@ -540,7 +554,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple> @@ -540,7 +554,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
540 maxLines: 1, 554 maxLines: 1,
541 overflow: TextOverflow.ellipsis, 555 overflow: TextOverflow.ellipsis,
542 style: TextStyle( 556 style: TextStyle(
543 - color: bgColor, 557 + color: roomColor,
544 fontWeight: FontWeight.bold, 558 fontWeight: FontWeight.bold,
545 fontSize: ScreenUtil().setSp(32)), 559 fontSize: ScreenUtil().setSp(32)),
546 ), 560 ),