xt / Flutter-ReserveApp · Commits

Go to a project

Commit fd51f2217a57224ee98d99f2dd7e4bfac02261c3

Authored by wdn127929
1 parent 1a652abb
build: skipped

已选菜品展示桌位信息，还差分享

Inline Side-by-side
Showing 4 changed files with 875 additions and 2 deletions
import 'package:json_annotation/json_annotation.dart';
part 'reserve_detail_model.g.dart';
@JsonSerializable()
class ReserveDetailModel extends Object {
@JsonKey(name: 'ret')
int ret;
@JsonKey(name: 'data')
ReserveDetailSunModel data;
@JsonKey(name: 'msg')
String msg;
ReserveDetailModel(
this.ret,
this.data,
this.msg,
);
factory ReserveDetailModel.fromJson(Map<String, dynamic> srcJson) =>
_$ReserveDetailModelFromJson(srcJson);
Map<String, dynamic> toJson() => _$ReserveDetailModelToJson(this);
}
@JsonSerializable()
class ReserveDetailSunModel extends Object {
@JsonKey(name: 'id')
String id;
@JsonKey(name: 'orderid')
String orderid;
@JsonKey(name: 'openid')
String openid;
@JsonKey(name: 'sid')
String sid;
@JsonKey(name: 'room_demand')
List<RoomdDemand> roomDemand;
@JsonKey(name: 'tid')
String tid;
@JsonKey(name: 'tableinfo')
String tableinfo;
@JsonKey(name: 'pnum')
String pnum;
@JsonKey(name: 'rname')
String rname;
@JsonKey(name: 'sex')
String sex;
@JsonKey(name: 'phone')
String phone;
@JsonKey(name: 'cusdem')
String cusdem;
@JsonKey(name: 'cusman')
String cusman;
@JsonKey(name: 'rdate')
String rdate;
@JsonKey(name: 'edate')
String edate;
@JsonKey(name: 'vdate')
String vdate;
@JsonKey(name: 'ddate')
String ddate;
@JsonKey(name: 'is_set_ddate')
String isSetDdate;
@JsonKey(name: 'ddate_solt')
String ddateSolt;
@JsonKey(name: 'status')
String status;
@JsonKey(name: 'cause')
String cause;
@JsonKey(name: 'abolition')
String abolition;
@JsonKey(name: 'action')
String action;
@JsonKey(name: 'type')
String type;
@JsonKey(name: 'code')
String code;
@JsonKey(name: 'operator_openid')
int operatorOpenid;
@JsonKey(name: 'channel')
String channel;
@JsonKey(name: 'cdate')
String cdate;
@JsonKey(name: 'seller')
Seller seller;
@JsonKey(name: 'tables')
List<Tables> tables;
@JsonKey(name: 'customers')
List<Customers> customers;
@JsonKey(name: 'cancel')
Cancel cancel;
@JsonKey(name: 'order')
Order order;
ReserveDetailSunModel(
this.id,
this.orderid,
this.openid,
this.sid,
this.roomDemand,
this.tid,
this.tableinfo,
this.pnum,
this.rname,
this.sex,
this.phone,
this.cusdem,
this.cusman,
this.rdate,
this.edate,
this.vdate,
this.ddate,
this.isSetDdate,
this.ddateSolt,
this.status,
this.cause,
this.abolition,
this.action,
this.type,
this.code,
this.operatorOpenid,
this.channel,
this.cdate,
this.seller,
this.tables,
this.customers,
this.cancel,
this.order,
);
factory ReserveDetailSunModel.fromJson(Map<String, dynamic> srcJson) =>
_$ReserveDetailSunModelFromJson(srcJson);
Map<String, dynamic> toJson() => _$ReserveDetailSunModelToJson(this);
}
@JsonSerializable()
class RoomdDemand extends Object {
@JsonKey(name: 'id')
String id;
@JsonKey(name: 'sellerid')
String sellerid;
@JsonKey(name: 'name')
String name;
@JsonKey(name: 'standard')
String standard;
@JsonKey(name: 'status')
String status;
@JsonKey(name: 'cdate')
String cdate;
RoomdDemand(
this.id,
this.sellerid,
this.name,
this.standard,
this.status,
this.cdate,
);
factory RoomdDemand.fromJson(Map<String, dynamic> srcJson) =>
_$RoomdDemandFromJson(srcJson);
Map<String, dynamic> toJson() => _$RoomdDemandToJson(this);
}
@JsonSerializable()
class Seller extends Object {
@JsonKey(name: 'id')
String id;
@JsonKey(name: 'sellername')
String sellername;
@JsonKey(name: 'seller_image')
String sellerImage;
@JsonKey(name: 'phone')
String phone;
@JsonKey(name: 'map_address')
String mapAddress;
@JsonKey(name: 'daily')
Daily daily;
@JsonKey(name: 'seller_tel')
String sellerTel;
@JsonKey(name: 'is_tele')
String isTele;
@JsonKey(name: 'is_online_reserve')
String isOnlineReserve;
@JsonKey(name: 'isopen_md')
String isopenMd;
@JsonKey(name: 'lat')
String lat;
@JsonKey(name: 'long')
String long;
@JsonKey(name: 'rec_stime')
String recStime;
@JsonKey(name: 'rec_etime')
String recEtime;
@JsonKey(name: 'is_open_order')
String isOpenOrder;
@JsonKey(name: 'is_open_wine')
String isOpenWine;
Seller(
this.id,
this.sellername,
this.sellerImage,
this.phone,
this.mapAddress,
this.daily,
this.sellerTel,
this.isTele,
this.isOnlineReserve,
this.isopenMd,
this.lat,
this.long,
this.recStime,
this.recEtime,
this.isOpenOrder,
this.isOpenWine,
);
factory Seller.fromJson(Map<String, dynamic> srcJson) =>
_$SellerFromJson(srcJson);
Map<String, dynamic> toJson() => _$SellerToJson(this);
}
@JsonSerializable()
class Daily extends Object {
@JsonKey(name: 'morning')
String morning;
@JsonKey(name: 'noon')
String noon;
@JsonKey(name: 'night')
String night;
Daily(
this.morning,
this.noon,
this.night,
);
factory Daily.fromJson(Map<String, dynamic> srcJson) =>
_$DailyFromJson(srcJson);
Map<String, dynamic> toJson() => _$DailyToJson(this);
}
@JsonSerializable()
class Tables extends Object {
@JsonKey(name: 'id')
String id;
@JsonKey(name: 'name')
String name;
@JsonKey(name: 'tid')
String tid;
@JsonKey(name: 'table_pnum')
String tablePnum;
@JsonKey(name: 'rid')
String rid;
@JsonKey(name: 'rname')
String rname;
Tables(
this.id,
this.name,
this.tid,
this.tablePnum,
this.rid,
this.rname,
);
factory Tables.fromJson(Map<String, dynamic> srcJson) =>
_$TablesFromJson(srcJson);
Map<String, dynamic> toJson() => _$TablesToJson(this);
}
@JsonSerializable()
class Customers extends Object {
@JsonKey(name: 'openid')
String openid;
@JsonKey(name: 'nickname')
String nickname;
@JsonKey(name: 'headimgurl')
String headimgurl;
@JsonKey(name: 'remind_date')
String remindDate;
Customers(
this.openid,
this.nickname,
this.headimgurl,
this.remindDate,
);
factory Customers.fromJson(Map<String, dynamic> srcJson) =>
_$CustomersFromJson(srcJson);
Map<String, dynamic> toJson() => _$CustomersToJson(this);
}
@JsonSerializable()
class Cancel extends Object {
@JsonKey(name: 'id')
String id;
@JsonKey(name: 'uid')
String uid;
@JsonKey(name: 'uname')
String uname;
@JsonKey(name: 'openid')
String openid;
@JsonKey(name: 'desc')
String desc;
@JsonKey(name: 'up_rid')
String upRid;
@JsonKey(name: 'action_type')
String actionType;
@JsonKey(name: 'cdate')
String cdate;
Cancel(
this.id,
this.uid,
this.uname,
this.openid,
this.desc,
this.upRid,
this.actionType,
this.cdate,
);
factory Cancel.fromJson(Map<String, dynamic> srcJson) =>
_$CancelFromJson(srcJson);
Map<String, dynamic> toJson() => _$CancelToJson(this);
}
@JsonSerializable()
class Order extends Object {
@JsonKey(name: 'id')
String id;
@JsonKey(name: 'rid')
String rid;
@JsonKey(name: 'no')
String no;
@JsonKey(name: 'row_num')
String rowNum;
@JsonKey(name: 'pnum')
String pnum;
@JsonKey(name: 'sellerid')
String sellerid;
@JsonKey(name: 'openid')
String openid;
@JsonKey(name: 'price')
int price;
@JsonKey(name: 'type')
String type;
@JsonKey(name: 'behavior')
String behavior;
@JsonKey(name: 'cdate')
String cdate;
@JsonKey(name: 'cookbooklist')
List<CookbooklistDetail> cookbooklist;
Order(
this.id,
this.rid,
this.no,
this.rowNum,
this.pnum,
this.sellerid,
this.openid,
this.price,
this.type,
this.behavior,
this.cdate,
this.cookbooklist,
);
factory Order.fromJson(Map<String, dynamic> srcJson) =>
_$OrderFromJson(srcJson);
Map<String, dynamic> toJson() => _$OrderToJson(this);
}
@JsonSerializable()
class CookbooklistDetail extends Object {
@JsonKey(name: 'id')
String id;
@JsonKey(name: 'orderid')
String orderid;
@JsonKey(name: 'openid')
String openid;
@JsonKey(name: 'cookbookid')
String cookbookid;
@JsonKey(name: 'price')
String price;
@JsonKey(name: 'cookname')
String cookname;
@JsonKey(name: 'cookunit')
String cookunit;
@JsonKey(name: 'cookimage')
String cookimage;
@JsonKey(name: 'class_name')
String className;
@JsonKey(name: 'classid')
String classid;
@JsonKey(name: 'class_order')
String classOrder;
@JsonKey(name: 'fromSoucre')
String fromSoucre;
@JsonKey(name: 'source')
String source;
@JsonKey(name: 'status')
String status;
@JsonKey(name: 'identity')
String identity;
@JsonKey(name: 'cdate')
String cdate;
CookbooklistDetail(
this.id,
this.orderid,
this.openid,
this.cookbookid,
this.price,
this.cookname,
this.cookunit,
this.cookimage,
this.className,
this.classid,
this.classOrder,
this.fromSoucre,
this.source,
this.status,
this.identity,
this.cdate,
);
factory CookbooklistDetail.fromJson(Map<String, dynamic> srcJson) =>
_$CookbooklistFromJson(srcJson);
Map<String, dynamic> toJson() => _$CookbooklistToJson(this);
}
... ...
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'reserve_detail_model.dart';
// **************************************************************************
// JsonSerializableGenerator
// **************************************************************************
ReserveDetailModel _$ReserveDetailModelFromJson(Map<String, dynamic> json) {
return ReserveDetailModel(
json['ret'] as int,
json['data'] == null
? null
: ReserveDetailSunModel.fromJson(
json['data'] as Map<String, dynamic>),
json['msg'] as String);
}
Map<String, dynamic> _$ReserveDetailModelToJson(ReserveDetailModel instance) =>
<String, dynamic>{
'ret': instance.ret,
'data': instance.data,
'msg': instance.msg
};
ReserveDetailSunModel _$ReserveDetailSunModelFromJson(
Map<String, dynamic> json) {
return ReserveDetailSunModel(
json['id'] as String,
json['orderid'] as String,
json['openid'] as String,
json['sid'] as String,
(json['room_demand'] as List)
?.map((e) => e == null
? null
: RoomdDemand.fromJson(e as Map<String, dynamic>))
?.toList(),
json['tid'] as String,
json['tableinfo'] as String,
json['pnum'] as String,
json['rname'] as String,
json['sex'] as String,
json['phone'] as String,
json['cusdem'] as String,
json['cusman'] as String,
json['rdate'] as String,
json['edate'] as String,
json['vdate'] as String,
json['ddate'] as String,
json['is_set_ddate'] as String,
json['ddate_solt'] as String,
json['status'] as String,
json['cause'] as String,
json['abolition'] as String,
json['action'] as String,
json['type'] as String,
json['code'] as String,
json['operator_openid'] as int,
json['channel'] as String,
json['cdate'] as String,
json['seller'] == null
? null
: Seller.fromJson(json['seller'] as Map<String, dynamic>),
(json['tables'] as List)
?.map((e) =>
e == null ? null : Tables.fromJson(e as Map<String, dynamic>))
?.toList(),
(json['customers'] as List)
?.map((e) =>
e == null ? null : Customers.fromJson(e as Map<String, dynamic>))
?.toList(),
json['cancel'] == null
? null
: Cancel.fromJson(json['cancel'] as Map<String, dynamic>),
json['order'] == null
? null
: Order.fromJson(json['order'] as Map<String, dynamic>));
}
Map<String, dynamic> _$ReserveDetailSunModelToJson(
ReserveDetailSunModel instance) =>
<String, dynamic>{
'id': instance.id,
'orderid': instance.orderid,
'openid': instance.openid,
'sid': instance.sid,
'room_demand': instance.roomDemand,
'tid': instance.tid,
'tableinfo': instance.tableinfo,
'pnum': instance.pnum,
'rname': instance.rname,
'sex': instance.sex,
'phone': instance.phone,
'cusdem': instance.cusdem,
'cusman': instance.cusman,
'rdate': instance.rdate,
'edate': instance.edate,
'vdate': instance.vdate,
'ddate': instance.ddate,
'is_set_ddate': instance.isSetDdate,
'ddate_solt': instance.ddateSolt,
'status': instance.status,
'cause': instance.cause,
'abolition': instance.abolition,
'action': instance.action,
'type': instance.type,
'code': instance.code,
'operator_openid': instance.operatorOpenid,
'channel': instance.channel,
'cdate': instance.cdate,
'seller': instance.seller,
'tables': instance.tables,
'customers': instance.customers,
'cancel': instance.cancel,
'order': instance.order
};
RoomdDemand _$RoomdDemandFromJson(Map<String, dynamic> json) {
return RoomdDemand(
json['id'] as String,
json['sellerid'] as String,
json['name'] as String,
json['standard'] as String,
json['status'] as String,
json['cdate'] as String);
}
Map<String, dynamic> _$RoomdDemandToJson(RoomdDemand instance) =>
<String, dynamic>{
'id': instance.id,
'sellerid': instance.sellerid,
'name': instance.name,
'standard': instance.standard,
'status': instance.status,
'cdate': instance.cdate
};
Seller _$SellerFromJson(Map<String, dynamic> json) {
return Seller(
json['id'] as String,
json['sellername'] as String,
json['seller_image'] as String,
json['phone'] as String,
json['map_address'] as String,
json['daily'] == null
? null
: Daily.fromJson(json['daily'] as Map<String, dynamic>),
json['seller_tel'] as String,
json['is_tele'] as String,
json['is_online_reserve'] as String,
json['isopen_md'] as String,
json['lat'] as String,
json['long'] as String,
json['rec_stime'] as String,
json['rec_etime'] as String,
json['is_open_order'] as String,
json['is_open_wine'] as String);
}
Map<String, dynamic> _$SellerToJson(Seller instance) => <String, dynamic>{
'id': instance.id,
'sellername': instance.sellername,
'seller_image': instance.sellerImage,
'phone': instance.phone,
'map_address': instance.mapAddress,
'daily': instance.daily,
'seller_tel': instance.sellerTel,
'is_tele': instance.isTele,
'is_online_reserve': instance.isOnlineReserve,
'isopen_md': instance.isopenMd,
'lat': instance.lat,
'long': instance.long,
'rec_stime': instance.recStime,
'rec_etime': instance.recEtime,
'is_open_order': instance.isOpenOrder,
'is_open_wine': instance.isOpenWine
};
Daily _$DailyFromJson(Map<String, dynamic> json) {
return Daily(json['morning'] as String, json['noon'] as String,
json['night'] as String);
}
Map<String, dynamic> _$DailyToJson(Daily instance) => <String, dynamic>{
'morning': instance.morning,
'noon': instance.noon,
'night': instance.night
};
Tables _$TablesFromJson(Map<String, dynamic> json) {
return Tables(
json['id'] as String,
json['name'] as String,
json['tid'] as String,
json['table_pnum'] as String,
json['rid'] as String,
json['rname'] as String);
}
Map<String, dynamic> _$TablesToJson(Tables instance) => <String, dynamic>{
'id': instance.id,
'name': instance.name,
'tid': instance.tid,
'table_pnum': instance.tablePnum,
'rid': instance.rid,
'rname': instance.rname
};
Customers _$CustomersFromJson(Map<String, dynamic> json) {
return Customers(json['openid'] as String, json['nickname'] as String,
json['headimgurl'] as String, json['remind_date'] as String);
}
Map<String, dynamic> _$CustomersToJson(Customers instance) => <String, dynamic>{
'openid': instance.openid,
'nickname': instance.nickname,
'headimgurl': instance.headimgurl,
'remind_date': instance.remindDate
};
Cancel _$CancelFromJson(Map<String, dynamic> json) {
return Cancel(
json['id'] as String,
json['uid'] as String,
json['uname'] as String,
json['openid'] as String,
json['desc'] as String,
json['up_rid'] as String,
json['action_type'] as String,
json['cdate'] as String);
}
Map<String, dynamic> _$CancelToJson(Cancel instance) => <String, dynamic>{
'id': instance.id,
'uid': instance.uid,
'uname': instance.uname,
'openid': instance.openid,
'desc': instance.desc,
'up_rid': instance.upRid,
'action_type': instance.actionType,
'cdate': instance.cdate
};
Order _$OrderFromJson(Map<String, dynamic> json) {
return Order(
json['id'] as String,
json['rid'] as String,
json['no'] as String,
json['row_num'] as String,
json['pnum'] as String,
json['sellerid'] as String,
json['openid'] as String,
json['price'] as int,
json['type'] as String,
json['behavior'] as String,
json['cdate'] as String,
(json['cookbooklist'] as List)
?.map((e) => e == null
? null
: CookbooklistDetail.fromJson(e as Map<String, dynamic>))
?.toList());
}
Map<String, dynamic> _$OrderToJson(Order instance) => <String, dynamic>{
'id': instance.id,
'rid': instance.rid,
'no': instance.no,
'row_num': instance.rowNum,
'pnum': instance.pnum,
'sellerid': instance.sellerid,
'openid': instance.openid,
'price': instance.price,
'type': instance.type,
'behavior': instance.behavior,
'cdate': instance.cdate,
'cookbooklist': instance.cookbooklist
};
CookbooklistDetail _$CookbooklistFromJson(Map<String, dynamic> json) {
return CookbooklistDetail(
json['id'] as String,
json['orderid'] as String,
json['openid'] as String,
json['cookbookid'] as String,
json['price'] as String,
json['cookname'] as String,
json['cookunit'] as String,
json['cookimage'] as String,
json['class_name'] as String,
json['classid'] as String,
json['class_order'] as String,
json['fromSoucre'] as String,
json['source'] as String,
json['status'] as String,
json['identity'] as String,
json['cdate'] as String);
}
Map<String, dynamic> _$CookbooklistToJson(CookbooklistDetail instance) =>
<String, dynamic>{
'id': instance.id,
'orderid': instance.orderid,
'openid': instance.openid,
'cookbookid': instance.cookbookid,
'price': instance.price,
'cookname': instance.cookname,
'cookunit': instance.cookunit,
'cookimage': instance.cookimage,
'class_name': instance.className,
'classid': instance.classid,
'class_order': instance.classOrder,
'fromSoucre': instance.fromSoucre,
'source': instance.source,
'status': instance.status,
'identity': instance.identity,
'cdate': instance.cdate
};
... ...
... ... @@ -35,6 +35,7 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
_getOrderFoodData();
_getTableInfoData();
});
}
... ... @@ -52,7 +53,7 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> {
_getTableInfoData() async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {
"uid": userModel.user.openid,
"openid": userModel.user.openid,
"rid": widget.rid
};
//明天完成 桌位名称信息
... ... @@ -117,7 +118,16 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> {
_getRow(
'人数', _orderFoodProvider.createdOrderSunModel.pnum),
VEmptyView(30),
_getRow('桌位', 'ffff')
_orderFoodProvider.reserveDetailSunModel != null
? _getRow(
'桌位',
_orderFoodProvider
.reserveDetailSunModel.tables.length >
0
? _orderFoodProvider
.reserveDetailSunModel.tables[0].name
: '')
: Container(),
],
),
),
... ... @@ -288,6 +298,7 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> {
pageState: model.pageState,
callback: () {
_getOrderFoodData();
_getTableInfoData();
},
emptyMsg: "暂时没有已选菜品哦",
emptyImg: "empty_search",
... ...
... ... @@ -3,6 +3,7 @@ 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/created_order_model.dart';
import 'package:one_key/models/reserve_detail_model.dart';
import 'package:one_key/net/base_resp.dart';
import 'package:one_key/net/dio_util.dart';
import 'package:one_key/net/http_url.dart';
... ... @@ -13,6 +14,7 @@ class OrderFoodProvider extends ChangeNotifier {
PageState pageState = PageState.Loading;
List<Map<String, List<Cookbooklist>>> orderList = []; //已点菜单信息
CreatedOrderSunModel createdOrderSunModel;
ReserveDetailSunModel reserveDetailSunModel;
///顾客扫桌码点餐-扫码创建订单
getOrderFoodData(BuildContext context, Map<String, String> params,
... ... @@ -94,6 +96,8 @@ class OrderFoodProvider extends ChangeNotifier {
if (baseResp.data.isEmpty) {
} else {
//解析解析
reserveDetailSunModel =
ReserveDetailModel.fromJson(baseResp.responseData).data;
}
notifyListeners();
} else {
... ...