Commit 72d4932c2e25862e00b31ab3d8029a973a1e1043

Authored by wdn127929
1 parent 8ee29d21

变更预订的时候uid传订单原来绑定的UI

@@ -297,7 +297,7 @@ class NotebookDetail { @@ -297,7 +297,7 @@ class NotebookDetail {
297 297
298 @override 298 @override
299 String toString() { 299 String toString() {
300 - return 'NotebookDetail{id: $id, con_amount:$con_amount,abolition: $abolition, tableinfo: $tableinfo,actual_pum:$actual_pum, pnum: $pnum, rname: $rname, sex: $sex, phone: $phone, cusdem: $cusdem, cusman: $cusman, ddate: $ddate, is_set_ddate: $is_set_ddate, ddate_solt: $ddate_solt, status: $status, action: $action, type: $type, note_name: $note_name, seller_user_phone:$seller_user_phone, nick_name: $nick_name,channel: $channel, cdate: $cdate, demands: $demands, tables: $tables, cancel: $cancel, gid: $gid}'; 300 + return 'NotebookDetail{id: $id, uid: $uid ,con_amount:$con_amount,abolition: $abolition, tableinfo: $tableinfo,actual_pum:$actual_pum, pnum: $pnum, rname: $rname, sex: $sex, phone: $phone, cusdem: $cusdem, cusman: $cusman, ddate: $ddate, is_set_ddate: $is_set_ddate, ddate_solt: $ddate_solt, status: $status, action: $action, type: $type, note_name: $note_name, seller_user_phone:$seller_user_phone, nick_name: $nick_name,channel: $channel, cdate: $cdate, demands: $demands, tables: $tables, cancel: $cancel, gid: $gid}';
301 } 301 }
302 } 302 }
303 303
@@ -48,11 +48,12 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) { @@ -48,11 +48,12 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) {
48 ..orderInfo = json['order_info'] == null 48 ..orderInfo = json['order_info'] == null
49 ? null 49 ? null
50 : OrderInfo.fromJson(json['order_info'] as Map<String, dynamic>) 50 : OrderInfo.fromJson(json['order_info'] as Map<String, dynamic>)
51 - ..gid = json['gid'] as String; 51 + ..gid = json['gid'] as String;
52 } 52 }
53 53
54 Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) => 54 Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) =>
55 <String, dynamic>{ 55 <String, dynamic>{
  56 + 'uid': instance.uid,
56 'id': instance.id, 57 'id': instance.id,
57 'tableinfo': instance.tableinfo, 58 'tableinfo': instance.tableinfo,
58 'abolition': instance.abolition, 59 'abolition': instance.abolition,
@@ -72,7 +73,7 @@ Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) => @@ -72,7 +73,7 @@ Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) =>
72 'type': instance.type, 73 'type': instance.type,
73 'note_name': instance.note_name, 74 'note_name': instance.note_name,
74 'nick_name': instance.nick_name, 75 'nick_name': instance.nick_name,
75 - 'seller_user_phone':instance.seller_user_phone, 76 + 'seller_user_phone': instance.seller_user_phone,
76 'channel': instance.channel, 77 'channel': instance.channel,
77 'cdate': instance.cdate, 78 'cdate': instance.cdate,
78 'demands': instance.demands, 79 'demands': instance.demands,
@@ -80,7 +81,7 @@ Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) => @@ -80,7 +81,7 @@ Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) =>
80 'cancel': instance.cancel, 81 'cancel': instance.cancel,
81 'order': instance.order, 82 'order': instance.order,
82 'order_info': instance.orderInfo, 83 'order_info': instance.orderInfo,
83 - 'gid':instance.gid 84 + 'gid': instance.gid
84 }; 85 };
85 OrderInfo _$OrderInfoFromJson(Map<String, dynamic> json) { 86 OrderInfo _$OrderInfoFromJson(Map<String, dynamic> json) {
86 return OrderInfo( 87 return OrderInfo(
@@ -2027,6 +2027,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -2027,6 +2027,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
2027 } 2027 }
2028 FocusScope.of(context) 2028 FocusScope.of(context)
2029 .requestFocus(FocusNode()); //点击空白处隐藏键盘 2029 .requestFocus(FocusNode()); //点击空白处隐藏键盘
  2030 + print(widget.detailEntity.uid);
2030 2031
2031 SunReserveInfoModel _model = 2032 SunReserveInfoModel _model =
2032 _notebookDetailChangeModel.detailEntity.type == 2033 _notebookDetailChangeModel.detailEntity.type ==
@@ -2035,7 +2036,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -2035,7 +2036,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
2035 await _notebookDetailChangeModel 2036 await _notebookDetailChangeModel
2036 .updateOnlineReserveInfo(context, nameStr) 2037 .updateOnlineReserveInfo(context, nameStr)
2037 : await _notebookDetailChangeModel 2038 : await _notebookDetailChangeModel
2038 - .setReserveInfo(context, nameStr); 2039 + .setReserveInfo(context, nameStr,
  2040 + widget.detailEntity.uid);
2039 if (ObjectUtil.isNotEmpty(_model.row) || 2041 if (ObjectUtil.isNotEmpty(_model.row) ||
2040 ObjectUtil.isNotEmpty(_model.row.id)) { 2042 ObjectUtil.isNotEmpty(_model.row.id)) {
2041 print('成功'); 2043 print('成功');
@@ -573,7 +573,7 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -573,7 +573,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
573 573
574 ///录入更改内部预订 574 ///录入更改内部预订
575 Future<SunReserveInfoModel> setReserveInfo( 575 Future<SunReserveInfoModel> setReserveInfo(
576 - BuildContext context, String nameStr) async { 576 + BuildContext context, String nameStr, String uid) async {
577 UserModel userModel = Provider.of<UserModel>(context, listen: false); 577 UserModel userModel = Provider.of<UserModel>(context, listen: false);
578 578
579 // String tempTime; 579 // String tempTime;
@@ -678,7 +678,7 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -678,7 +678,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
678 // 'is_set_ddate': "1", 678 // 'is_set_ddate': "1",
679 "ddate": '${ddate}'.substring(0, 10), //到店时间 679 "ddate": '${ddate}'.substring(0, 10), //到店时间
680 "channel": '5', 680 "channel": '5',
681 - "uid": userModel.user.openid 681 + "uid": uid
682 }; 682 };
683 if (detailEntity.id.isNotEmpty && detailEntity.id != "-1") { 683 if (detailEntity.id.isNotEmpty && detailEntity.id != "-1") {
684 params['rid'] = detailEntity.id; 684 params['rid'] = detailEntity.id;