xt / Flutter-ReserveApp · Commits

Go to a project

Commit 0ea1d788d7d6d0b07920b15b95710bee86014049

Authored by wdn127929
1 parent 0705ecbb
build: skipped

排菜套餐

Inline Side-by-side
Showing 10 changed files with 1943 additions and 370 deletions
... ... @@ -19,6 +19,8 @@ class MenuModel {
bool isChange = false; //是否发生数量变化
List<dynamic> cookbooklistShow;
int outAllNum;
int allsumPreviewShow = 0;
MenuModel(
{this.id,
... ... @@ -28,7 +30,8 @@ class MenuModel {
this.order,
this.status,
this.classType,
this.cookbooklist});
this.cookbooklist,
this.outAllNum});
MenuModel.fromJson(Map<String, dynamic> json) {
id = json['id'];
... ... @@ -63,6 +66,44 @@ class MenuModel {
});
}
}
MenuModel.fromJson3(Map<String, dynamic> json) {
id = json['id'];
outAllNum = json['out_all_num'] ?? 1;
sellerid = json['sellerid'];
className = json['class_name'];
classLabel = json['class_label'];
order = json['order'];
status = json['status'];
classType = json['class_type'];
allSum = json['allSum'] * outAllNum ?? 0;
if (json['cookbooklist'] != null) {
cookbooklist = [];
json['cookbooklist'].forEach((v) {
v['out_all_num'] = outAllNum;
cookbooklist.add(new MenuSunModel.fromJson4(v));
});
}
}
MenuModel.fromJson5(Map<String, dynamic> json) {
id = json['id'];
outAllNum = json['out_all_num'] ?? 1;
sellerid = json['sellerid'];
className = json['class_name'];
classLabel = json['class_label'];
order = json['order'];
status = json['status'];
classType = json['class_type'];
allSum = json['allSum'] ?? 0;
if (json['cookbooklist'] != null) {
cookbooklist = [];
json['cookbooklist'].forEach((v) {
v['out_all_num'] = outAllNum;
cookbooklist.add(new MenuSunModel.fromJson5(v));
});
}
outAllNum = json['out_all_num'] ?? 1;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
... ... @@ -77,6 +118,7 @@ class MenuModel {
if (this.cookbooklist != null) {
data['cookbooklist'] = this.cookbooklist.map((v) => v.toJson()).toList();
}
data['out_all_num'] = this.outAllNum;
return data;
}
}
... ... @@ -468,6 +510,205 @@ class MenuSunModel {
// amounttemp += v.amount;
amountHasOrderList.add(v);
}
// amount = amounttemp;
});
// }
}
if (json['cookList'] != null) {
cookList = [];
json['cookList'].forEach((v) {
cookList.add(new MenuModel.fromJson2(v));
});
}
taste = json['taste'];
cooks = json['cooks'];
json['cook_style'] != null && json['cook_style'] != ''
? json['cook_style'] is DishCookStyle
? json['cook_style']
: cookStyle = DishCookStyle.fromJson(json['cook_style'] is Map
? json['cook_style']
: convert.json.decode(json['cook_style']))
: cookStyle = DishCookStyle.fromJson({
// 'image_type': image != null && image != '' ? '1' : '2',
'image_type': '1',
'name_type': '3'
});
}
MenuSunModel.fromJson4(Map<String, dynamic> json) {
id = json['id'];
sellerid = json['sellerid'];
mid = json['mid'];
lid = json['lid'];
unit = json['unit'];
name = json['name'];
price = json['price'];
member_price = json['member_price'];
first_name = json['first_name'];
search_code = json['search_code'];
channel = json['channel'];
dishesvideo = json['dishesvideo'];
dishesgif = json['dishesgif'];
status = json['status'];
setup = json['setup'];
give = json['give'];
clear_num = json['clear_num'];
record_num = json['record_num'];
image = json['image'];
is_weigh = json['is_weigh'];
desc = json['desc'];
order_o = json['order_o'];
cdate = json['cdate'];
if (json['spec'] != null) {
spec = [];
json['spec'].forEach((v) {
if (v is Map) {
spec.add(new SpecModel.fromJson(v));
} else if (v is SpecModel) {
spec.add(v);
}
});
}
if (spec != null) {
specCan = [];
spec.forEach((v) {
if (v.status == '1') {
specCan.add(v);
}
});
}
isSpec = json['isSpec'];
// practice = json['practice'];
if (json['practice'] != null) {
practice = [];
// if (json['practice'].length > 0 && json['practice'][0] is String) {
// } else {
json['practice'].forEach((v) {
if (v is Map) {
practice.add(new PracticeModel.fromJson(v));
} else if (v is PracticeModel) {
practice.add(v);
}
});
// }
}
amount = json['amount'] ?? 0;
amountC.text = amount.toString();
int amounttemp = 0;
if (json['amountHasOrderList'] != null) {
amountHasOrderList = [];
// if (json['practice'].length > 0 && json['practice'][0] is String) {
// } else {
json['amountHasOrderList'].forEach((v) {
if (v is Map) {
amounttemp += v['amount'];
amountHasOrderList.add(new AmountHasOrder.fromJson(v));
} else if (v is AmountHasOrder) {
amounttemp += v.amount;
amountHasOrderList.add(v);
}
amount = amounttemp * json['out_all_num'];
});
// }
}
if (json['cookList'] != null) {
cookList = [];
json['cookList'].forEach((v) {
cookList.add(new MenuModel.fromJson2(v));
});
}
taste = json['taste'];
cooks = json['cooks'];
json['cook_style'] != null && json['cook_style'] != ''
? json['cook_style'] is DishCookStyle
? json['cook_style']
: cookStyle = DishCookStyle.fromJson(json['cook_style'] is Map
? json['cook_style']
: convert.json.decode(json['cook_style']))
: cookStyle = DishCookStyle.fromJson({
// 'image_type': image != null && image != '' ? '1' : '2',
'image_type': '1',
'name_type': '3'
});
}
MenuSunModel.fromJson5(Map<String, dynamic> json) {
id = json['id'];
sellerid = json['sellerid'];
mid = json['mid'];
lid = json['lid'];
unit = json['unit'];
name = json['name'];
price = json['price'];
member_price = json['member_price'];
first_name = json['first_name'];
search_code = json['search_code'];
channel = json['channel'];
dishesvideo = json['dishesvideo'];
dishesgif = json['dishesgif'];
status = json['status'];
setup = json['setup'];
give = json['give'];
clear_num = json['clear_num'];
record_num = json['record_num'];
image = json['image'];
is_weigh = json['is_weigh'];
desc = json['desc'];
order_o = json['order_o'];
cdate = json['cdate'];
if (json['spec'] != null) {
spec = [];
json['spec'].forEach((v) {
if (v is Map) {
spec.add(new SpecModel.fromJson(v));
} else if (v is SpecModel) {
spec.add(v);
}
});
}
if (spec != null) {
specCan = [];
spec.forEach((v) {
if (v.status == '1') {
specCan.add(v);
}
});
}
isSpec = json['isSpec'];
// practice = json['practice'];
if (json['practice'] != null) {
practice = [];
// if (json['practice'].length > 0 && json['practice'][0] is String) {
// } else {
json['practice'].forEach((v) {
if (v is Map) {
practice.add(new PracticeModel.fromJson(v));
} else if (v is PracticeModel) {
practice.add(v);
}
});
// }
}
amount = json['amount'] ?? 0;
amountC.text = amount.toString();
int amounttemp = 0;
if (json['amountHasOrderList'] != null) {
amountHasOrderList = [];
// if (json['practice'].length > 0 && json['practice'][0] is String) {
// } else {
json['amountHasOrderList'].forEach((v) {
if (v is Map) {
// amounttemp += v['amount'];
amountHasOrderList.add(new AmountHasOrder.fromJson(v));
} else if (v is AmountHasOrder) {
// amounttemp += v.amount;
amountHasOrderList.add(v);
}
// amount = amounttemp;
// amount = amounttemp * json['out_all_num'];
});
// }
... ...
... ... @@ -88,7 +88,10 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
_planDishProvider.menuModelForManager.forEach((element) {
if (element.className == '临时加菜') {
element.cookbooklist.forEach((old) {
carSum -= old.amount;
if (old.name != '临时菜') {
carSum -= old.amount;
}
// if (old.amountHasOrderList != null &&
// old.amountHasOrderList.length > 0) {
// carSum -= old.amountHasOrderList[0].amount;
... ... @@ -146,8 +149,42 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
newvalue.cookbooklist.forEach((newcook) {
if (oldcook.id == newcook.id) {
//同一个菜
oldcook.amount = newcook.amount;
carSum += newcook.amount;
oldcook.amountHasOrderList = newcook.amountHasOrderList;
newcook.amountHasOrderList.forEach((element1) {
carSum += element1.amount;
});
// if (oldcook.amountHasOrderList[0].practiceModel != null &&
// newcook.amountHasOrderList[0].practiceModel != null &&
// oldcook.amountHasOrderList[0].specModel != null &&
// newcook.amountHasOrderList[0].specModel != null) {
// if (oldcook.amountHasOrderList[0].practiceModel
// .practice ==
// newcook.amountHasOrderList[0].practiceModel
// .practice &&
// oldcook.amountHasOrderList[0].specModel.specid ==
// newcook
// .amountHasOrderList[0].specModel.specid) {
// oldcook.amountHasOrderList[0].amount =
// newcook.amountHasOrderList[0].amount;
// carSum += newcook.amountHasOrderList[0].amount;
// }
// } else if (oldcook.amountHasOrderList[0].practiceModel ==
// null &&
// oldcook.amountHasOrderList[0].specModel != null) {
// if (oldcook.amountHasOrderList[0].specModel.specid ==
// newcook.amountHasOrderList[0].specModel.specid) {
// if (oldcook.amount !=
// newcook.amountHasOrderList[0].amount) {
// has = true;
// oldcook.amount +=
// newcook.amountHasOrderList[0].amount;
// oldcook.amountHasOrderList =
// newcook.amountHasOrderList;
// show.allSum += newcook.amountHasOrderList[0].amount;
// }
// }
// }
}
});
});
... ... @@ -189,7 +226,7 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
widget.planCookByRidSunModel.packageList.forEach((package) {
if (package.id == menuSunModel.id) {
//同一个套餐
menuSunModel.amount = package.amount;
menuSunModel.amountHasOrderList = package.amountHasOrderList;
menuSunModel.cookList.forEach((oldcooklist) {
package.cookList.forEach((newcooklist) {
if (oldcooklist.id == newcooklist.id) {
... ... @@ -197,13 +234,54 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
oldcooklist.cookbooklist.forEach((oldcook) {
newcooklist.cookbooklist.forEach((newcook) {
if (oldcook.id == newcook.id) {
// oldcook.amount = newcook.amount;
// carSum += newcook.amount;
oldcook.amountHasOrderList =
newcook.amountHasOrderList;
newcook.amountHasOrderList.forEach((element) {
carSum += element.amount;
carSum += element.amount *
package.amountHasOrderList[0].amount;
});
// oldcook.amount = newcook.amount;
// carSum += newcook.amount;
// if (oldcook.amountHasOrderList[0]
// .practiceModel !=
// null &&
// newcook.amountHasOrderList[0].practiceModel !=
// null &&
// oldcook.amountHasOrderList[0].specModel !=
// null &&
// newcook.amountHasOrderList[0].specModel !=
// null) {
// if (oldcook.amountHasOrderList[0].practiceModel
// .practice ==
// newcook.amountHasOrderList[0]
// .practiceModel.practice &&
// oldcook.amountHasOrderList[0].specModel
// .specid ==
// newcook.amountHasOrderList[0].specModel
// .specid) {
// oldcook.amountHasOrderList =
// newcook.amountHasOrderList;
// newcook.amountHasOrderList.forEach((element) {
// carSum += element.amount;
// });
// }
// } else if (oldcook.amountHasOrderList[0]
// .practiceModel ==
// null &&
// oldcook.amountHasOrderList[0].specModel !=
// null) {
// if (oldcook.amountHasOrderList[0].specModel
// .specid ==
// newcook.amountHasOrderList[0].specModel
// .specid) {
// oldcook.amountHasOrderList =
// newcook.amountHasOrderList;
// newcook.amountHasOrderList.forEach((element) {
// carSum += element.amount;
// });
// }
// }
}
});
});
... ... @@ -265,13 +343,54 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
oldcooklist.cookbooklist.forEach((oldcook) {
newcooklist.cookbooklist.forEach((newcook) {
if (oldcook.id == newcook.id) {
// oldcook.amount = newcook.amount;
// carSum += newcook.amount;
oldcook.amountHasOrderList =
newcook.amountHasOrderList;
newcook.amountHasOrderList.forEach((element) {
carSum += element.amount;
newcook.amountHasOrderList.forEach((element1) {
carSum += element1.amount *
package.amountHasOrderList[0].amount;
});
// oldcook.amount = newcook.amount;
// carSum += newcook.amount;
// if (oldcook
// .amountHasOrderList[0].practiceModel !=
// null &&
// newcook.amountHasOrderList[0].practiceModel !=
// null &&
// oldcook.amountHasOrderList[0].specModel !=
// null &&
// newcook.amountHasOrderList[0].specModel !=
// null) {
// if (oldcook.amountHasOrderList[0].practiceModel
// .practice ==
// newcook.amountHasOrderList[0]
// .practiceModel.practice &&
// oldcook.amountHasOrderList[0].specModel
// .specid ==
// newcook.amountHasOrderList[0].specModel
// .specid) {
// oldcook.amountHasOrderList[0].amount =
// newcook.amountHasOrderList[0].amount;
// newcook.amountHasOrderList.forEach((element) {
// carSum += element.amount;
// });
// }
// } else if (oldcook
// .amountHasOrderList[0].practiceModel ==
// null &&
// oldcook.amountHasOrderList[0].specModel !=
// null) {
// if (oldcook
// .amountHasOrderList[0].specModel.specid ==
// newcook
// .amountHasOrderList[0].specModel.specid) {
// oldcook.amountHasOrderList[0].amount =
// newcook.amountHasOrderList[0].amount;
// newcook.amountHasOrderList.forEach((element) {
// carSum += element.amount;
// });
// }
// }
}
});
});
... ... @@ -321,7 +440,7 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
widget.planCookByRidSunModel.planList.forEach((package) {
if (package.id == menuSunModel.id) {
//同一个排菜
menuSunModel.amount = package.amount;
menuSunModel.amountHasOrderList = package.amountHasOrderList;
menuSunModel.cookList.forEach((oldcooklist) {
package.cookList.forEach((newcooklist) {
if (oldcooklist.id == newcooklist.id) {
... ... @@ -329,13 +448,54 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
oldcooklist.cookbooklist.forEach((oldcook) {
newcooklist.cookbooklist.forEach((newcook) {
if (oldcook.id == newcook.id) {
// oldcook.amount = newcook.amount;
// carSum += newcook.amount;
oldcook.amountHasOrderList =
newcook.amountHasOrderList;
newcook.amountHasOrderList.forEach((element) {
carSum += element.amount;
newcook.amountHasOrderList.forEach((element1) {
carSum += element1.amount *
package.amountHasOrderList[0].amount;
});
// oldcook.amount = newcook.amount;
// carSum += newcook.amount;
// if (oldcook.amountHasOrderList[0]
// .practiceModel !=
// null &&
// newcook.amountHasOrderList[0].practiceModel !=
// null &&
// oldcook.amountHasOrderList[0].specModel !=
// null &&
// newcook.amountHasOrderList[0].specModel !=
// null) {
// if (oldcook.amountHasOrderList[0].practiceModel
// .practice ==
// newcook.amountHasOrderList[0]
// .practiceModel.practice &&
// oldcook.amountHasOrderList[0].specModel
// .specid ==
// newcook.amountHasOrderList[0].specModel
// .specid) {
// oldcook.amountHasOrderList[0].amount =
// newcook.amountHasOrderList[0].amount;
// newcook.amountHasOrderList.forEach((element) {
// carSum += element.amount;
// });
// }
// } else if (oldcook.amountHasOrderList[0]
// .practiceModel ==
// null &&
// oldcook.amountHasOrderList[0].specModel !=
// null) {
// if (oldcook.amountHasOrderList[0].specModel
// .specid ==
// newcook.amountHasOrderList[0].specModel
// .specid) {
// oldcook.amountHasOrderList[0].amount =
// newcook.amountHasOrderList[0].amount;
// newcook.amountHasOrderList.forEach((element) {
// carSum += element.amount;
// });
// }
// }
}
});
});
... ... @@ -402,7 +562,8 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
}
_planDishProvider.pageStateMenu = PageState.ConnectivityError;
}
if (widget.planCookByRidSunModel.status == '1' ||
if (widget.planCookByRidSunModel == null ||
widget.planCookByRidSunModel.status == '1' ||
widget.planCookByRidSunModel.status == null) {
isCar = true;
} else {
... ... @@ -423,7 +584,8 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
olddata.forEach((store) {
if (store.id == newdata.id) {
if (newdata.amountHasOrderList == null ||
newdata.amountHasOrderList.length == 0) {
newdata.amountHasOrderList.length == 0 ||
newdata.amountHasOrderList[0].amount == 0) {
//同一个套餐
if (newdata.cookList.length == 0) {
newdata.cookList = store.cookList;
... ... @@ -442,8 +604,33 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
//同一菜品
if (value1.id == value2.id) {
// value1.amount = value2.amount;
value1.amountHasOrderList =
value2.amountHasOrderList;
value1.amountHasOrderList.forEach((value1son) {
value2.amountHasOrderList
.forEach((value2son) {
if (value1son.practiceModel != null &&
value2son.practiceModel != null &&
value1son.specModel != null &&
value2son.specModel != null) {
if (value1son.practiceModel.practice ==
value2son
.practiceModel.practice &&
value1son.specModel.specid ==
value2son.specModel.specid) {
value1son.amount = value2son.amount;
}
} else if (value1son.practiceModel ==
null &&
value1son.specModel != null) {
if (value1son.specModel.specid ==
value2son.specModel.specid) {
value1son.amount = value2son.amount;
}
}
});
});
// value1.amountHasOrderList =
// value2.amountHasOrderList;
print(_planDishProvider.menuModelForManager);
}
});
});
... ... @@ -467,7 +654,8 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
olddata.forEach((store) {
if (store.id == newdata.id) {
if (newdata.amountHasOrderList == null ||
newdata.amountHasOrderList.length == 0) {
newdata.amountHasOrderList.length == 0 ||
newdata.amountHasOrderList[0].amount == 0) {
//同一个套餐
if (newdata.cookList.length == 0) {
newdata.cookList = store.cookList;
... ... @@ -486,8 +674,33 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
//同一菜品
if (value1.id == value2.id) {
// value1.amount = value2.amount;
value1.amountHasOrderList =
value2.amountHasOrderList;
value1.amountHasOrderList.forEach((value1son) {
value2.amountHasOrderList
.forEach((value2son) {
if (value1son.practiceModel != null &&
value2son.practiceModel != null &&
value1son.specModel != null &&
value2son.specModel != null) {
if (value1son.practiceModel.practice ==
value2son
.practiceModel.practice &&
value1son.specModel.specid ==
value2son.specModel.specid) {
value1son.amount = value2son.amount;
}
} else if (value1son.practiceModel ==
null &&
value1son.specModel != null) {
if (value1son.specModel.specid ==
value2son.specModel.specid) {
value1son.amount = value2son.amount;
}
}
});
});
// value1.amountHasOrderList =
// value2.amountHasOrderList;
print(_planDishProvider.menuModelForManager);
}
});
});
... ... @@ -507,6 +720,68 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
});
} else if (element.className == '临时加菜') {
} else {
List<MenuModel> olddata = _planDishProvider.menuModelOld;
print(element);
olddata.forEach((old) {
if (element.id == old.id) {
// if (element.cookbooklist == null ||
// element.cookbooklist.length == 0) {
List<MenuSunModel> temp = element.cookbooklist;
element.cookbooklist = old.cookbooklist;
// } else {
// List<MenuSunModel> temp = old.cookbooklist;
temp.forEach((value2) {
if (value2.amountHasOrderList != null &&
value2.amountHasOrderList.length > 0) {
//有选中
element.cookbooklist.forEach((value1) {
// if (value1.id == value2.id) {
// value1.amountHasOrderList = value2.amountHasOrderList;
if (value1.id == value2.id) {
// if (value1.amountHasOrderList.length == 0) {
value1.amountHasOrderList = value2.amountHasOrderList;
// } else {
// value1.amountHasOrderList.forEach((value1son) {
// value2.amountHasOrderList.forEach((value2son) {
// if (value1son.practiceModel != null &&
// value2son.practiceModel != null &&
// value1son.specModel != null &&
// value2son.specModel != null) {
// if (value1son.practiceModel.practice ==
// value2son.practiceModel.practice &&
// value1son.specModel.specid ==
// value2son.specModel.specid) {
// value1son.amount = value2son.amount;
// }
// } else if (value1son.practiceModel == null &&
// value1son.specModel != null) {
// if (value1son.specModel.specid ==
// value2son.specModel.specid) {
// value1son.amount = value2son.amount;
// }
// }
// });
// });
// }
// value1.amount = value2.amount;
// value1.amountHasOrderList =
// value2.amountHasOrderList;
print(_planDishProvider.menuModelForManager);
// }
}
});
}
});
// }
}
});
//单菜
// bool hasmMenu = element.cookbooklist.any(((value) => value.amount > 0));
// if (hasmMenu) {
... ... @@ -522,6 +797,7 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
}
// planDishC.text = priceSum.toString();
});
print(_planDishProvider.menuModelForManager);
}
///菜品数据
... ... @@ -700,12 +976,21 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
element.className == '店内常点') {
element.cookbooklist.forEach((newdata) {
// newdata.amount = 0;
newdata.amountHasOrderList = [];
if (newdata.amountHasOrderList != null) {
newdata.amountHasOrderList.forEach((element) {
element.amount = 0;
});
}
newdata.cookList.forEach((cooklist) {
//同一分类
cooklist.cookbooklist.forEach((value1) {
// value1.amount = 0;
value1.amountHasOrderList = [];
if (value1.amountHasOrderList != null) {
value1.amountHasOrderList.forEach((element1) {
element1.amount = 0;
});
}
});
});
});
... ... @@ -713,13 +998,21 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
//临时加菜
element.cookbooklist.forEach((value) {
// value.amount = 0;
value.amountHasOrderList = [];
if (value.amountHasOrderList != null) {
value.amountHasOrderList.forEach((element1) {
element1.amount = 0;
});
}
});
} else {
//单菜
element.cookbooklist.forEach((value) {
// value.amount = 0;
value.amountHasOrderList = [];
if (value.amountHasOrderList != null) {
value.amountHasOrderList.forEach((element1) {
element1.amount = 0;
});
}
});
}
});
... ... @@ -744,7 +1037,9 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
if (element.className == '套餐') {
List<MenuSunModel> packagelist = [];
element.cookbooklist.forEach((cooklist) {
if (cooklist.amountHasOrderList.length > 0) {
if (cooklist.amountHasOrderList != null &&
cooklist.amountHasOrderList.length > 0 &&
cooklist.amountHasOrderList[0].amount > 0) {
packagelist.add(cooklist);
}
});
... ... @@ -756,7 +1051,9 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
} else if (element.className == '我的排菜') {
List<MenuSunModel> planlist = [];
element.cookbooklist.forEach((cooklist) {
if (cooklist.amountHasOrderList.length > 0) {
if (cooklist.amountHasOrderList != null &&
cooklist.amountHasOrderList.length > 0 &&
cooklist.amountHasOrderList[0].amount > 0) {
planlist.add(cooklist);
}
});
... ... @@ -768,7 +1065,9 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
} else if (element.className == '店内常点') {
List<MenuSunModel> oftenlist = [];
element.cookbooklist.forEach((cooklist) {
if (cooklist.amountHasOrderList.length > 0) {
if (cooklist.amountHasOrderList != null &&
cooklist.amountHasOrderList.length > 0 &&
cooklist.amountHasOrderList[0].amount > 0) {
oftenlist.add(cooklist);
}
});
... ... @@ -796,6 +1095,10 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
cooklistdata.add(element);
if (cooklistdata.length > 0) {
cooklistdata.forEach((cooklist) {
cooklist.cookbooklist.forEach((element) {
element.amountHasOrderList
.removeWhere((element) => element.amount == 0);
});
cooklist.cookbooklist.removeWhere((element) =>
element.amountHasOrderList == null ||
element.amountHasOrderList.length == 0);
... ... @@ -908,12 +1211,21 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
newdata.cookList.forEach((cooklist) {
//同一分类
cooklist.cookbooklist.forEach((value1) {
priceSum += double.parse(value1.price) *
value1.amount *
newdata.amountHasOrderList[0].amount;
memberPriceSum += double.parse(value1.member_price) *
value1.amount *
newdata.amountHasOrderList[0].amount;
if (value1.amountHasOrderList != null &&
value1.amountHasOrderList.length > 0) {
value1.amountHasOrderList.forEach((element1) {
priceSum += double.parse(element1.specModel.price) *
newdata.amountHasOrderList[0].amount *
element1.amount;
memberPriceSum += double.parse(
element1.specModel.memberPrice == '0' ||
element1.specModel.memberPrice == null
? element1.specModel.price
: element1.specModel.memberPrice) *
newdata.amountHasOrderList[0].amount *
element1.amount;
});
}
});
});
}
... ... @@ -991,12 +1303,21 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
newdata.cookList.forEach((cooklist) {
//同一分类
cooklist.cookbooklist.forEach((value1) {
priceSum += double.parse(value1.price) *
value1.amount *
newdata.amountHasOrderList[0].amount;
memberPriceSum += double.parse(value1.member_price) *
value1.amount *
newdata.amountHasOrderList[0].amount;
if (value1.amountHasOrderList != null &&
value1.amountHasOrderList.length > 0) {
value1.amountHasOrderList.forEach((element1) {
priceSum += double.parse(element1.specModel.price) *
newdata.amountHasOrderList[0].amount *
element1.amount;
memberPriceSum += double.parse(
element1.specModel.memberPrice == '0' ||
element1.specModel.memberPrice == null
? element1.specModel.price
: element1.specModel.memberPrice) *
newdata.amountHasOrderList[0].amount *
element1.amount;
});
}
});
});
}
... ... @@ -1089,9 +1410,13 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
// });
menuSunModel.cookList.forEach((element) {
//遍历菜品
element.cookbooklist.forEach((cook) {
carSum -= cook.amount;
});
if (element.cookbooklist != null) {
element.cookbooklist.forEach((cook) {
cook.amountHasOrderList.forEach((cookson) {
carSum -= cookson.amount;
});
});
}
});
} else {
carSum--;
... ... @@ -1163,14 +1488,15 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
)
: SizedBox(),
HEmptyView(20),
if (amountHasOrder.specModel != null)
if (amountHasOrder.specModel != null && amountHasOrder.amount > 0)
Text(amountHasOrder.specModel.specs,
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyColours.color_515151,
fontSize: font(14))),
HEmptyView(20),
if (amountHasOrder.practiceModel != null)
if (amountHasOrder.practiceModel != null &&
amountHasOrder.amount > 0)
Text(amountHasOrder.practiceModel.name,
style: TextStyle(
fontWeight: FontWeight.bold,
... ... @@ -1212,7 +1538,12 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
menuSunModel.cookList.forEach((element) {
//遍历菜品
element.cookbooklist.forEach((cook) {
carSum += cook.amount;
if (cook.amountHasOrderList != null &&
cook.amountHasOrderList.length > 0) {
cook.amountHasOrderList.forEach((son) {
carSum += son.amount;
});
}
});
});
} else {
... ... @@ -2353,12 +2684,13 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
if (value.id == elementCook.id) {
//同一个套餐
// elementCook.cookList = value.cookList;
elementCook.amount = value.moreSum;
elementCook.amountHasOrderList[0]
.amount = value.moreSum;
elementCook.cookList
.forEach((oldValue) {
oldValue.cookbooklist
.forEach((oldCook) {
oldCook.amount = 0;
oldCook.amountHasOrderList = [];
});
value.cookList.forEach((newValue) {
if (newValue.id == oldValue.id) {
... ... @@ -2374,10 +2706,16 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
if (oldCook.id ==
newCook.id) {
//同一个菜品
oldCook.amount =
newCook.amount;
carSumTemp +=
newCook.amount;
oldCook.amountHasOrderList
.addAll(newCook
.amountHasOrderList);
carSumTemp += newCook
.amountHasOrderList[
0]
.amount *
value.moreSum;
}
});
});
... ... @@ -2394,13 +2732,76 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
if (element.id == one.id) {
//同一分类
element.cookbooklist.forEach((old) {
old.amountHasOrderList = [];
one.cookbooklist.forEach((newvalue) {
if (old.id == newvalue.id) {
if (element.className == '临时加菜' &&
old.name == '临时菜') {
} else {
old.amount = newvalue.amount;
carSumTemp += newvalue.amount;
// old.amountHasOrderList =
// newvalue.amountHasOrderList;
old.amountHasOrderList.addAll(
newvalue.amountHasOrderList);
newvalue.amountHasOrderList
.forEach((newelement) {
//
carSumTemp += newelement.amount;
});
// old.amountHasOrderList
// .forEach((oldelement) {
// if (oldelement.practiceModel !=
// null &&
// newvalue
// .amountHasOrderList[
// 0]
// .practiceModel !=
// null &&
// oldelement.specModel !=
// null &&
// newvalue
// .amountHasOrderList[
// 0]
// .specModel !=
// null) {
// if (oldelement.practiceModel
// .practice ==
// oldelement
// .practiceModel
// .practice &&
// oldelement.specModel
// .specid ==
// newvalue
// .amountHasOrderList[
// 0]
// .specModel
// .specid) {
// oldelement.amount = newvalue
// .amountHasOrderList[0]
// .amount;
// carSumTemp += newvalue
// .amountHasOrderList[0]
// .amount;
// }
// } else if (oldelement
// .practiceModel ==
// null &&
// oldelement.specModel !=
// null) {
// if (oldelement
// .specModel.specid ==
// newvalue
// .amountHasOrderList[0]
// .specModel
// .specid) {
// oldelement.amount = newvalue
// .amountHasOrderList[0]
// .amount;
// carSumTemp += newvalue
// .amountHasOrderList[0]
// .amount;
// }
// }
// });
}
}
});
... ... @@ -2444,8 +2845,8 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
//调用提交排菜接口
//调用排菜信息提交接口
FocusScope.of(context).requestFocus(
FocusNode()); //点击空白处隐藏键盘‘i7 8uuUUUUUUum'x\c []
FocusScope.of(context)
.requestFocus(FocusNode()); //点击空白处隐藏键盘
List<MenuModel> showList = [];
List<MenuSunModel> dataLocalShowMore = []; //二级菜单
List<MenuModel> dataLocalShowOne = []; //一级菜单
... ... @@ -2465,7 +2866,8 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
// }
element.cookbooklist.forEach((value) {
if (value.amount > 0) {
if (value.amountHasOrderList != null &&
value.amountHasOrderList.length > 0) {
// if (!isChange) {
// priceSum += double.parse(value.price) * value.amount;
// memberPriceSum +=
... ... @@ -2485,20 +2887,57 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
cook.cookbooklist.forEach((cookSun) {
// 具体菜品
if (cookSun.amount > 0) {
//当前菜品已选择
// moreSum += cookSun.amount;
cookSum += cookSun.amount;
if (cookSun.amountHasOrderList !=
null &&
cookSun.amountHasOrderList
.length >
0) {
// cookSun.amountHasOrderList
// .forEach((hasOrder) {
// //当前菜品已选择
// // moreSum += cookSun.amount;
// if (hasOrder.amount > 0) {
// cookSum += hasOrder.amount;
// // if (isChange) {
// // priceSum += double.parse(cookSun.price) * cookSun.amount;
// // memberPriceSum +=
// // double.parse(cookSun.member_price) * cookSun.amount;
// // }
// // carSum += hasOrder.amount;
// }
// });
// cooklistSun.add(cookSun);
cookSun.amountHasOrderList
.forEach((element) {
MenuSunModel cooksunTemp =
MenuSunModel.fromJson2(
cookSun.toJson());
cookSum += element.amount;
// carSum += element.amount;
cooksunTemp.amountHasOrderList =
[];
cooksunTemp.amountHasOrderList
.add(element);
cooklistSun.add(cooksunTemp);
});
}
// if (isChange) {
// priceSum += double.parse(cookSun.price) * cookSun.amount;
// memberPriceSum +=
// double.parse(cookSun.member_price) * cookSun.amount;
// }
// if (cookSun.amount > 0) {
// //当前菜品已选择
// // moreSum += cookSun.amount;
// cookSum += cookSun.amount;
carSum += cookSun.amount;
cooklistSun.add(cookSun);
}
// // if (isChange) {
// // priceSum += double.parse(cookSun.price) * cookSun.amount;
// // memberPriceSum +=
// // double.parse(cookSun.member_price) * cookSun.amount;
// // }
// carSum += cookSun.amount;
// cooklistSun.add(cookSun);
// }
});
if (cooklistSun.length > 0) {
cook.cookbooklist = cooklistSun;
... ... @@ -2507,7 +2946,8 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
value.cookList = moreMenu;
}
});
value.moreSum = value.amount;
value.moreSum =
value.amountHasOrderList[0].amount;
value.channel = element.className == '套餐'
? '1'
: element.className == '我的排菜'
... ... @@ -2531,8 +2971,14 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
// }
else {
//单菜
bool hasmMenu = element.cookbooklist
.any(((value) => value.amount > 0));
// bool hasmMenu = element.cookbooklist.any(
// ((value) =>
// value.amountHasOrderList[0].amount >
// 0));
bool hasmMenu = element.cookbooklist.any(
((value) =>
value.amountHasOrderList != null &&
value.amountHasOrderList.length > 0));
if (hasmMenu) {
//单品此类有选中菜品
MenuModel menuModel = MenuModel();
... ... @@ -2547,13 +2993,31 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
List<MenuSunModel> cookbooklist = [];
int allSum = 0;
element.cookbooklist.forEach((value) {
if (value.amount > 0) {
allSum += value.amount;
// priceSum += double.parse(value.price) * value.amount;
// memberPriceSum +=
// double.parse(value.member_price) * value.amount;
carSum += value.amount;
cookbooklist.add(value);
if (value.amountHasOrderList != null &&
value.amountHasOrderList.length > 0) {
// value.amountHasOrderList
// .forEach((hasOrder) {
// if (hasOrder.amount > 0) {
// allSum += hasOrder.amount;
// // priceSum += double.parse(value.price) * value.amount;
// // memberPriceSum +=
// // double.parse(value.member_price) * value.amount;
// carSum += hasOrder.amount;
// }
// });
// cookbooklist.add(value);
value.amountHasOrderList
.forEach((element) {
allSum += element.amount;
// carSum += element.amount;
MenuSunModel cooksunTemp =
MenuSunModel.fromJson2(
value.toJson());
cooksunTemp.amountHasOrderList = [];
cooksunTemp.amountHasOrderList
.add(element);
cookbooklist.add(cooksunTemp);
});
}
});
menuModel.allSum = allSum;
... ... @@ -2564,12 +3028,16 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
// planDishC.text = priceSum.toString();
});
}
print(dataLocalShowMore);
print(dataLocalShowOne);
dataLocalShowMore.forEach((value) {
value.cookList.forEach((newValue) {
if (showList.length == 0) {
showList.add(
MenuModel.fromJson2(newValue.toJson()));
Map<String, dynamic> map = newValue.toJson();
map['out_all_num'] =
value.amountHasOrderList[0].amount;
showList.add(MenuModel.fromJson3(map));
} else {
bool hasC = false;
showList.forEach((show) {
... ... @@ -2581,22 +3049,101 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
bool has = false;
show.cookbooklist.forEach((oldshow) {
if (oldshow.id == newcook.id) {
//同一个菜品
has = true;
oldshow.amount += newcook.amount;
show.allSum += newcook.amount;
//同一个菜品条件: id相同,并且规格和做法也相同
if (oldshow.amountHasOrderList[0]
.practiceModel !=
null &&
newcook.amountHasOrderList[0]
.practiceModel !=
null &&
oldshow.amountHasOrderList[0]
.specModel !=
null &&
newcook.amountHasOrderList[0]
.specModel !=
null) {
if (oldshow
.amountHasOrderList[0]
.practiceModel
.practice ==
newcook
.amountHasOrderList[0]
.practiceModel
.practice &&
oldshow.amountHasOrderList[0]
.specModel.specid ==
newcook
.amountHasOrderList[0]
.specModel
.specid) {
// if (oldshow.amount !=
// newcook
// .amountHasOrderList[0]
// .amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0]
.amount *
value.amountHasOrderList[0]
.amount;
oldshow.amountHasOrderList
.addAll(newcook
.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0]
.amount;
// }
}
} else if (oldshow
.amountHasOrderList[0]
.practiceModel ==
null &&
oldshow.amountHasOrderList[0]
.specModel !=
null) {
if (oldshow.amountHasOrderList[0]
.specModel.specid ==
newcook.amountHasOrderList[0]
.specModel.specid) {
// if (oldshow.amount !=
// newcook
// .amountHasOrderList[0]
// .amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0]
.amount *
value.amountHasOrderList[0]
.amount;
oldshow.amountHasOrderList
.addAll(newcook
.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0]
.amount;
// }
}
}
}
});
if (!has) {
//旧的里面没有该菜品
newcook.amount = newcook
.amountHasOrderList[0]
.amount *
value
.amountHasOrderList[0].amount;
show.cookbooklist.add(newcook);
}
});
}
});
if (!hasC) {
showList.add(
MenuModel.fromJson2(newValue.toJson()));
Map<String, dynamic> map =
newValue.toJson();
map['out_all_num'] =
value.amountHasOrderList[0].amount;
showList.add(MenuModel.fromJson3(map));
}
}
});
... ... @@ -2607,7 +3154,7 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
dataLocalShowOne.forEach((element) {
if (showList.length == 0) {
showList
.add(MenuModel.fromJson2(element.toJson()));
.add(MenuModel.fromJson3(element.toJson()));
} else {
bool hasC = false;
showList.forEach((show) {
... ... @@ -2619,10 +3166,72 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
bool has = false;
show.cookbooklist.forEach((oldshow) {
if (oldshow.id == newcook.id) {
//同一个菜品
has = true;
oldshow.amount += newcook.amount;
show.allSum += newcook.amount;
//同一个菜品条件: id相同,并且规格和做法也相同
if (oldshow.amountHasOrderList[0]
.practiceModel !=
null &&
newcook.amountHasOrderList[0]
.practiceModel !=
null &&
oldshow.amountHasOrderList[0]
.specModel !=
null &&
newcook.amountHasOrderList[0]
.specModel !=
null) {
if (oldshow
.amountHasOrderList[0]
.practiceModel
.practice ==
newcook
.amountHasOrderList[0]
.practiceModel
.practice &&
oldshow.amountHasOrderList[0]
.specModel.specid ==
newcook
.amountHasOrderList[0]
.specModel
.specid) {
// if (oldshow
// .amountHasOrderList[0].amount !=
// newcook
// .amountHasOrderList[0].amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0].amount;
oldshow.amountHasOrderList.addAll(
newcook.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0].amount;
// }
}
} else if (oldshow
.amountHasOrderList[0]
.practiceModel ==
null &&
oldshow.amountHasOrderList[0]
.specModel !=
null) {
if (oldshow.amountHasOrderList[0]
.specModel.specid ==
newcook.amountHasOrderList[0]
.specModel.specid) {
// if (oldshow
// .amountHasOrderList[0].amount !=
// newcook
// .amountHasOrderList[0].amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0].amount;
oldshow.amountHasOrderList.addAll(
newcook.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0].amount;
// }
}
}
}
});
if (!has) {
... ... @@ -2634,7 +3243,7 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
});
if (!hasC) {
showList.add(
MenuModel.fromJson2(element.toJson()));
MenuModel.fromJson3(element.toJson()));
}
}
});
... ... @@ -2642,7 +3251,8 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
// double memberPriceSum = 0; //会员价
// TextEditingController planDishC =
// TextEditingController(); //排菜价
_initMenuModelForManagerData();
setState(() {});
NavigatorUtil.goOrderPreviewPage(context,
object: {'object': showList},
name: planDishName ?? "",
... ...
... ... @@ -7,6 +7,7 @@ import 'package:one_key/route/navigator_util.dart';
import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/MyDivider.dart';
import 'package:one_key/widgets/h_empty_view.dart';
import 'package:one_key/widgets/loading.dart';
import 'package:one_key/widgets/system_app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
... ... @@ -89,7 +90,8 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
}
_getPlanCookByRid() async {
await _planDishProvider.getPlanCookByRid(context, {'rid': widget.rid});
await _planDishProvider.getPlanCookByRid(context, {'rid': widget.rid},
showLoading: true, selfDismiss: true);
if (_planDishProvider.planCookByRidSunModel != null) {
pnumController.text = _planDishProvider.planCookByRidSunModel.pnum;
if (_planDishProvider.planCookByRidSunModel.totalPrice != '0' &&
... ... @@ -119,6 +121,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
[_getCookbookByClass(showLoading: true), _getPlanCookList()])
.then((results) {
print(results[0]);
if (results[0] && results[1]) {
_planDishProvider.menuModelForManager =
List.from(_planDishProvider.menuModel);
... ... @@ -135,7 +138,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
newvalue.cookbooklist.forEach((newcook) {
if (oldcook.id == newcook.id) {
//同一个菜
oldcook.amount = newcook.amount;
oldcook.amountHasOrderList = newcook.amountHasOrderList;
}
});
});
... ... @@ -172,7 +175,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
.forEach((package) {
if (package.id == menuSunModel.id) {
//同一个套餐
menuSunModel.amount = package.amount;
menuSunModel.amountHasOrderList = package.amountHasOrderList;
menuSunModel.cookList.forEach((oldcooklist) {
package.cookList.forEach((newcooklist) {
if (oldcooklist.id == newcooklist.id) {
... ... @@ -180,7 +183,8 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
oldcooklist.cookbooklist.forEach((oldcook) {
newcooklist.cookbooklist.forEach((newcook) {
if (oldcook.id == newcook.id) {
oldcook.amount = newcook.amount;
oldcook.amountHasOrderList =
newcook.amountHasOrderList;
}
});
});
... ... @@ -223,7 +227,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
.forEach((package) {
if (package.id == menuSunModel.id) {
//同一个排菜
menuSunModel.amount = package.amount;
menuSunModel.amountHasOrderList = package.amountHasOrderList;
menuSunModel.cookList.forEach((oldcooklist) {
package.cookList.forEach((newcooklist) {
if (oldcooklist.id == newcooklist.id) {
... ... @@ -231,7 +235,9 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
oldcooklist.cookbooklist.forEach((oldcook) {
newcooklist.cookbooklist.forEach((newcook) {
if (oldcook.id == newcook.id) {
oldcook.amount = newcook.amount;
// oldcook.amount = newcook.amount;
oldcook.amountHasOrderList =
newcook.amountHasOrderList;
}
});
});
... ... @@ -283,7 +289,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
// _calculatePrice();
// }
_planDishProvider.pageStateMenu = PageState.Success;
Loading.hideLoading(context);
setState(() {});
} else {
if (!results[0]) {
... ... @@ -292,9 +298,12 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
// Utils.showToast('');
}
_planDishProvider.pageStateMenu = PageState.ConnectivityError;
Loading.hideLoading(context);
setState(() {});
}
}).catchError((e) {
print(e);
Loading.hideLoading(context);
});
}
... ... @@ -306,7 +315,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
};
bool success = await _planDishProvider.getCookbookByClass(context, params,
showLoading: showLoading);
showLoading: showLoading, selfDismiss: true);
if (success) {
return true;
} else {
... ... @@ -353,7 +362,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
"sellerid": Provider.of<UserModel>(context, listen: false).user.sellerid,
};
bool success = await _planDishProvider.getPlanCookList(context, params,
showLoading: isShowLoading);
showLoading: isShowLoading, selfDismiss: true);
if (success) {
return true;
} else {
... ... @@ -1064,7 +1073,8 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
// }
element.cookbooklist.forEach((value) {
if (value.amount > 0) {
if (value.amountHasOrderList != null &&
value.amountHasOrderList.length > 0) {
// if (!isChange) {
// priceSum += double.parse(value.price) * value.amount;
// memberPriceSum +=
... ... @@ -1083,10 +1093,24 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
cook.cookbooklist.forEach((cookSun) {
// 具体菜品
if (cookSun.amount > 0) {
if (cookSun.amountHasOrderList !=
null &&
cookSun.amountHasOrderList.length >
0) {
//当前菜品已选择
// moreSum += cookSun.amount;
cookSum += cookSun.amount;
cookSun.amountHasOrderList
.forEach((element) {
MenuSunModel cooksunTemp =
MenuSunModel.fromJson2(
cookSun.toJson());
cookSum += element.amount;
// carSum += element.amount;
cooksunTemp.amountHasOrderList = [];
cooksunTemp.amountHasOrderList
.add(element);
cooklistSun.add(cooksunTemp);
});
// if (isChange) {
// priceSum += double.parse(cookSun.price) * cookSun.amount;
... ... @@ -1095,7 +1119,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
// }
// carSum += cookSun.amount;
cooklistSun.add(cookSun);
// cooklistSun.add(cookSun);
}
});
if (cooklistSun.length > 0) {
... ... @@ -1105,7 +1129,8 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
value.cookList = moreMenu;
}
});
value.moreSum = value.amount;
value.moreSum =
value.amountHasOrderList[0].amount;
value.channel = element.className == '套餐'
? '1'
: '2'; // 1套餐----2排菜
... ... @@ -1126,8 +1151,39 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
// }
else {
//单菜
bool hasmMenu = element.cookbooklist
.any(((value) => value.amount > 0));
// bool hasmMenu = element.cookbooklist
// .any(((value) => value.amount > 0));
// if (hasmMenu) {
// //单品此类有选中菜品
// MenuModel menuModel = MenuModel();
// menuModel.className = element.className;
// menuModel.classLabel = element.classLabel;
// menuModel.classType = element.classType;
// menuModel.id = element.id;
// menuModel.order = element.order;
// menuModel.sellerid = element.sellerid;
// menuModel.status = element.status;
// menuModel.cookbooklist = [];
// List<MenuSunModel> cookbooklist = [];
// int allSum = 0;
// element.cookbooklist.forEach((value) {
// if (value.amount > 0) {
// allSum += value.amount;
// // priceSum += double.parse(value.price) * value.amount;
// // memberPriceSum +=
// // double.parse(value.member_price) * value.amount;
// // carSum += value.amount;
// cookbooklist.add(value);
// }
// });
// menuModel.allSum = allSum;
// menuModel.cookbooklist.addAll(cookbooklist);
// dataLocalShowOne.add(menuModel);
// }
bool hasmMenu = element.cookbooklist.any(
((value) =>
value.amountHasOrderList != null &&
value.amountHasOrderList.length > 0));
if (hasmMenu) {
//单品此类有选中菜品
MenuModel menuModel = MenuModel();
... ... @@ -1142,13 +1198,31 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
List<MenuSunModel> cookbooklist = [];
int allSum = 0;
element.cookbooklist.forEach((value) {
if (value.amount > 0) {
allSum += value.amount;
// priceSum += double.parse(value.price) * value.amount;
// memberPriceSum +=
// double.parse(value.member_price) * value.amount;
// carSum += value.amount;
cookbooklist.add(value);
if (value.amountHasOrderList != null &&
value.amountHasOrderList.length > 0) {
// value.amountHasOrderList
// .forEach((hasOrder) {
// if (hasOrder.amount > 0) {
// allSum += hasOrder.amount;
// // priceSum += double.parse(value.price) * value.amount;
// // memberPriceSum +=
// // double.parse(value.member_price) * value.amount;
// carSum += hasOrder.amount;
// }
// });
// cookbooklist.add(value);
value.amountHasOrderList
.forEach((element) {
allSum += element.amount;
// carSum += element.amount;
MenuSunModel cooksunTemp =
MenuSunModel.fromJson2(
value.toJson());
cooksunTemp.amountHasOrderList = [];
cooksunTemp.amountHasOrderList
.add(element);
cookbooklist.add(cooksunTemp);
});
}
});
menuModel.allSum = allSum;
... ... @@ -1160,11 +1234,53 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
});
}
// dataLocalShowMore.forEach((value) {
// value.cookList.forEach((newValue) {
// if (showList.length == 0) {
// // showList.add(
// // MenuModel.fromJson2(newValue.toJson()));
// Map<String, dynamic> map = newValue.toJson();
// map['out_all_num'] =
// value.amountHasOrderList[0].amount;
// showList.add(MenuModel.fromJson3(map));
// } else {
// bool hasC = false;
// showList.forEach((show) {
// if (show.id == newValue.id) {
// hasC = true;
// //数据存在相同菜类
// newValue.cookbooklist.forEach((newcook) {
// bool has = false;
// show.cookbooklist.forEach((oldshow) {
// if (oldshow.id == newcook.id) {
// //同一个菜品
// has = true;
// oldshow.amount += newcook.amount;
// show.allSum += newcook.amount;
// }
// });
// if (!has) {
// //旧的里面没有该菜品
// show.cookbooklist.add(newcook);
// }
// });
// }
// });
// if (!hasC) {
// showList.add(
// MenuModel.fromJson2(newValue.toJson()));
// }
// }
// });
// });
dataLocalShowMore.forEach((value) {
value.cookList.forEach((newValue) {
if (showList.length == 0) {
showList.add(
MenuModel.fromJson2(newValue.toJson()));
Map<String, dynamic> map = newValue.toJson();
map['out_all_num'] =
value.amountHasOrderList[0].amount;
showList.add(MenuModel.fromJson3(map));
} else {
bool hasC = false;
showList.forEach((show) {
... ... @@ -1176,22 +1292,94 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
bool has = false;
show.cookbooklist.forEach((oldshow) {
if (oldshow.id == newcook.id) {
//同一个菜品
has = true;
oldshow.amount += newcook.amount;
show.allSum += newcook.amount;
//同一个菜品条件: id相同,并且规格和做法也相同
if (oldshow.amountHasOrderList[0]
.practiceModel !=
null &&
newcook.amountHasOrderList[0]
.practiceModel !=
null &&
oldshow.amountHasOrderList[0]
.specModel !=
null &&
newcook.amountHasOrderList[0]
.specModel !=
null) {
if (oldshow
.amountHasOrderList[0]
.practiceModel
.practice ==
newcook
.amountHasOrderList[0]
.practiceModel
.practice &&
oldshow.amountHasOrderList[0]
.specModel.specid ==
newcook
.amountHasOrderList[0]
.specModel
.specid) {
// if (oldshow.amount !=
// newcook
// .amountHasOrderList[0]
// .amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0]
.amount *
value.amountHasOrderList[0]
.amount;
oldshow.amountHasOrderList.addAll(
newcook.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0].amount;
// }
}
} else if (oldshow
.amountHasOrderList[0]
.practiceModel ==
null &&
oldshow.amountHasOrderList[0]
.specModel !=
null) {
if (oldshow.amountHasOrderList[0]
.specModel.specid ==
newcook.amountHasOrderList[0]
.specModel.specid) {
// if (oldshow.amount !=
// newcook
// .amountHasOrderList[0]
// .amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0]
.amount *
value.amountHasOrderList[0]
.amount;
oldshow.amountHasOrderList.addAll(
newcook.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0].amount;
// }
}
}
}
});
if (!has) {
//旧的里面没有该菜品
newcook.amount = newcook
.amountHasOrderList[0].amount *
value.amountHasOrderList[0].amount;
show.cookbooklist.add(newcook);
}
});
}
});
if (!hasC) {
showList.add(
MenuModel.fromJson2(newValue.toJson()));
Map<String, dynamic> map = newValue.toJson();
map['out_all_num'] =
value.amountHasOrderList[0].amount;
showList.add(MenuModel.fromJson3(map));
}
}
});
... ... @@ -1199,10 +1387,47 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
print(showList);
// dataLocalShowOne.forEach((element) {
// if (showList.length == 0) {
// showList
// .add(MenuModel.fromJson2(element.toJson()));
// } else {
// bool hasC = false;
// showList.forEach((show) {
// if (show.id == element.id) {
// hasC = true;
// //数据存在相同菜类
// element.cookbooklist.forEach((newcook) {
// bool has = false;
// show.cookbooklist.forEach((oldshow) {
// if (oldshow.id == newcook.id) {
// //同一个菜品
// has = true;
// oldshow.amountHasOrderList[0].amount +=
// newcook
// .amountHasOrderList[0].amount;
// show.allSum += oldshow
// .amountHasOrderList[0].amount;
// }
// });
// if (!has) {
// //旧的里面没有该菜品
// show.cookbooklist.add(newcook);
// }
// });
// }
// });
// if (!hasC) {
// showList
// .add(MenuModel.fromJson2(element.toJson()));
// }
// }
// });
dataLocalShowOne.forEach((element) {
if (showList.length == 0) {
showList
.add(MenuModel.fromJson2(element.toJson()));
.add(MenuModel.fromJson3(element.toJson()));
} else {
bool hasC = false;
showList.forEach((show) {
... ... @@ -1214,10 +1439,65 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
bool has = false;
show.cookbooklist.forEach((oldshow) {
if (oldshow.id == newcook.id) {
//同一个菜品
has = true;
oldshow.amount += newcook.amount;
show.allSum += newcook.amount;
//同一个菜品条件: id相同,并且规格和做法也相同
if (oldshow.amountHasOrderList[0]
.practiceModel !=
null &&
newcook.amountHasOrderList[0]
.practiceModel !=
null &&
oldshow.amountHasOrderList[0]
.specModel !=
null &&
newcook.amountHasOrderList[0]
.specModel !=
null) {
if (oldshow.amountHasOrderList[0]
.practiceModel.practice ==
newcook.amountHasOrderList[0]
.practiceModel.practice &&
oldshow.amountHasOrderList[0]
.specModel.specid ==
newcook.amountHasOrderList[0]
.specModel.specid) {
// if (oldshow
// .amountHasOrderList[0].amount !=
// newcook
// .amountHasOrderList[0].amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0].amount;
oldshow.amountHasOrderList.addAll(
newcook.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0].amount;
// }
}
} else if (oldshow.amountHasOrderList[0]
.practiceModel ==
null &&
oldshow.amountHasOrderList[0]
.specModel !=
null) {
if (oldshow.amountHasOrderList[0]
.specModel.specid ==
newcook.amountHasOrderList[0]
.specModel.specid) {
// if (oldshow
// .amountHasOrderList[0].amount !=
// newcook
// .amountHasOrderList[0].amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0].amount;
oldshow.amountHasOrderList.addAll(
newcook.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0].amount;
// }
}
}
}
});
if (!has) {
... ... @@ -1229,7 +1509,7 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
});
if (!hasC) {
showList
.add(MenuModel.fromJson2(element.toJson()));
.add(MenuModel.fromJson3(element.toJson()));
}
}
});
... ...
... ... @@ -537,38 +537,33 @@ class _OrderCreateTemporaryPageState extends State<OrderCreateTemporaryPage> {
textInputAction: TextInputAction.done,
onChanged: (value) {
// if (value != null && value != '') {
// //用户输入的数据
// int input = int.parse(value);
// //减去当前数据
// menuModel.allSum -= menuSunModel.amount;
// carSum -= menuSunModel.amount;
// if (input == 0) {
// //把当前菜品从列表中去除
// dataLocalShowOne[indexOne]
// .cookbooklist
// .removeAt(indexReal); //移除当前行
// //判断当前类没有cookbooklist,则删除当前类
// if (dataLocalShowOne[indexOne]
// .cookbooklist
// .length ==
// 0) {
// dataLocalShowOne.removeAt(indexOne);
// }
// } else {
// menuModel.allSum += input;
// carSum += input;
// }
// menuSunModel.amount = int.parse(value);
// _calculatePrice();
// setState(() {});
// }
if (value != null && value != '') {
//用户输入的数据
int input = int.parse(value);
//减去当前数据
allSum -= menuSunModel.amount;
// carSum -= menuSunModel.amount;
if (input == 0) {
//把当前菜品从列表中去除
menuSunShort.removeAt(index); //移除当前行
//判断当前类没有cookbooklist,则删除当前类
} else {
allSum += input;
}
menuSunModel.amount = int.parse(value);
menuSunModel.amountHasOrderList[0]
.amount = int.parse(value);
// _calculatePrice();
setState(() {});
bus.emit('refresh_data', menuSunShort);
}
},
onEditingComplete: () {
FocusScope.of(context).requestFocus(
... ...
... ... @@ -138,7 +138,8 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
// 具体菜品
if (cookSun.amountHasOrderList != null &&
cookSun.amountHasOrderList.length > 0) {
cookSun.amountHasOrderList.length > 0 &&
cookSun.amountHasOrderList[0].amount > 0) {
//当前菜品已选择
// moreSum += cookSun.amount;
... ... @@ -148,7 +149,8 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
MenuSunModel cooksunTemp =
MenuSunModel.fromJson2(cookSun.toJson());
cookSum += element.amount;
carSum += element.amount;
carSum +=
element.amount * value.amountHasOrderList[0].amount;
cooksunTemp.amountHasOrderList = [];
cooksunTemp.amountHasOrderList.add(element);
cooklistSun.add(cooksunTemp);
... ... @@ -448,56 +450,46 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
bool isChange = false; //套餐数量是否发生变化
//同一个套餐
store.cookList.forEach((storeCook) {
if (store.cookList.length > element.cookList.length) {
//删除了整个菜品分类
isChange = true;
}
element.cookList.forEach((cooklist) {
element.cookList.forEach((cooklist) {
store.cookList.forEach((storeCook) {
if (cooklist.id == storeCook.id) {
// if (cooklist.cookbooklist.length !=
// storeCook.cookbooklist.length) {
// isChange = true;
// }
//同一分类
if (cooklist.cookbooklist.length !=
storeCook.cookbooklist.length) {
isChange = true;
}
cooklist.cookbooklist.forEach((value1) {
storeCook.cookbooklist.forEach((value2) {
if (value1.id == value2.id) {
// if (value1.amount != value2.amount) {
// isChange = true;
// }
if (value1.amountHasOrderList != null &&
value2.amountHasOrderList != null) {
if (value1.amountHasOrderList.length !=
value2.amountHasOrderList.length) {
isChange = true;
} else {
value1.amountHasOrderList.forEach((element1) {
value2.amountHasOrderList.forEach((element2) {
if (element1.practiceModel != null &&
element2.practiceModel != null &&
element1.specModel != null &&
element2.specModel != null) {
if (element1.practiceModel.practice ==
element2.practiceModel.practice &&
element1.specModel.specid ==
element2.specModel.specid) {
if (element1.amount != element2.amount) {
isChange = true;
}
if (value1.amountHasOrderList.length !=
value2.amountHasOrderList.length) {
isChange = true;
} else {
value1.amountHasOrderList.forEach((element1) {
value2.amountHasOrderList.forEach((element2) {
if (element1.practiceModel != null &&
element2.practiceModel != null &&
element1.specModel != null &&
element2.specModel != null) {
if (element1.practiceModel.practice ==
element2.practiceModel.practice &&
element1.specModel.specid ==
element2.specModel.specid) {
if (element1.amount != element2.amount) {
isChange = true;
}
} else if (element1.practiceModel == null &&
element1.specModel != null) {
if (element1.specModel.specid ==
element2.specModel.specid) {
if (element1.amount != element2.amount) {
isChange = true;
}
}
} else if (element1.practiceModel == null &&
element1.specModel != null) {
if (element1.specModel.specid ==
element2.specModel.specid) {
if (element1.amount != element2.amount) {
isChange = true;
}
}
});
}
});
}
});
}
}
});
... ... @@ -505,6 +497,64 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
}
});
});
// store.cookList.forEach((storeCook) {
// if (store.cookList.length > element.cookList.length) {
// //删除了整个菜品分类
// isChange = true;
// }
// element.cookList.forEach((cooklist) {
// if (cooklist.id == storeCook.id) {
// // if (cooklist.cookbooklist.length !=
// // storeCook.cookbooklist.length) {
// // isChange = true;
// // }
// //同一分类
// cooklist.cookbooklist.forEach((value1) {
// storeCook.cookbooklist.forEach((value2) {
// if (value1.id == value2.id) {
// // if (value1.amount != value2.amount) {
// // isChange = true;
// // }
// if (value1.amountHasOrderList != null &&
// value2.amountHasOrderList != null) {
// if (value1.amountHasOrderList.length !=
// value2.amountHasOrderList.length) {
// isChange = true;
// } else {
// value1.amountHasOrderList.forEach((element1) {
// value2.amountHasOrderList.forEach((element2) {
// if (element1.practiceModel != null &&
// element2.practiceModel != null &&
// element1.specModel != null &&
// element2.specModel != null) {
// if (element1.practiceModel.practice ==
// element2.practiceModel.practice &&
// element1.specModel.specid ==
// element2.specModel.specid) {
// if (element1.amount != element2.amount) {
// isChange = true;
// }
// }
// } else if (element1.practiceModel == null &&
// element1.specModel != null) {
// if (element1.specModel.specid ==
// element2.specModel.specid) {
// if (element1.amount != element2.amount) {
// isChange = true;
// }
// }
// }
// });
// });
// }
// }
// }
// });
// });
// }
// });
// });
//当前套餐/排菜数量已经发生变化
if (!isChange) {
// priceSum += double.parse(store.planPrice) * element.amount;
... ... @@ -516,30 +566,51 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
element.amountHasOrderList[0].amount;
} else {
//单品
// element.cookList.forEach((cooklist) {
// //同一分类
// cooklist.cookbooklist.forEach((value1) {
// // priceSum += double.parse(value1.price) *
// // value1.amount *
// // element.amount;
// // memberPriceSum += double.parse(value1.member_price) *
// // value1.amount *
// // element.amount;
// priceSum += double.parse(
// value1.amountHasOrderList[0].specModel.price) *
// value1.amountHasOrderList[0].amount *
// element.amountHasOrderList[0].amount;
// memberPriceSum += double.parse(value1.amountHasOrderList[0]
// .specModel.memberPrice ==
// '0' ||
// value1.amountHasOrderList[0].specModel
// .memberPrice ==
// null
// ? value1.amountHasOrderList[0].specModel.price
// : value1
// .amountHasOrderList[0].specModel.memberPrice) *
// value1.amountHasOrderList[0].amount *
// element.amountHasOrderList[0].amount;
// });
// });
element.cookList.forEach((cooklist) {
//同一分类
cooklist.cookbooklist.forEach((value1) {
// priceSum += double.parse(value1.price) *
// value1.amount *
// element.amount;
// memberPriceSum += double.parse(value1.member_price) *
// value1.amount *
// element.amount;
priceSum += double.parse(
value1.amountHasOrderList[0].specModel.price) *
value1.amountHasOrderList[0].amount *
element.amountHasOrderList[0].amount;
memberPriceSum += double.parse(value1.amountHasOrderList[0]
.specModel.memberPrice ==
'0' ||
value1.amountHasOrderList[0].specModel
.memberPrice ==
null
? value1.amountHasOrderList[0].specModel.price
: value1
.amountHasOrderList[0].specModel.memberPrice) *
value1.amountHasOrderList[0].amount *
element.amountHasOrderList[0].amount;
if (value1.amountHasOrderList != null &&
value1.amountHasOrderList.length > 0) {
value1.amountHasOrderList.forEach((element1) {
priceSum += double.parse(element1.specModel.price) *
element.amountHasOrderList[0].amount *
element1.amount;
memberPriceSum += double.parse(
element1.specModel.memberPrice == '0' ||
element1.specModel.memberPrice == null
? element1.specModel.price
: element1.specModel.memberPrice) *
element.amountHasOrderList[0].amount *
element1.amount;
});
}
});
});
}
... ... @@ -568,6 +639,10 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
// isChange = true;
// }
//同一分类
if (cooklist.cookbooklist.length !=
storeCook.cookbooklist.length) {
isChange = true;
}
cooklist.cookbooklist.forEach((value1) {
storeCook.cookbooklist.forEach((value2) {
if (value1.id == value2.id) {
... ... @@ -624,30 +699,50 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
element.amountHasOrderList[0].amount;
} else {
//单品
// element.cookList.forEach((cooklist) {
// //同一分类
// cooklist.cookbooklist.forEach((value1) {
// // priceSum += double.parse(value1.price) *
// // value1.amount *
// // element.amount;
// // memberPriceSum += double.parse(value1.member_price) *
// // value1.amount *
// // element.amount;
// priceSum += double.parse(
// value1.amountHasOrderList[0].specModel.price) *
// value1.amountHasOrderList[0].amount *
// element.amountHasOrderList[0].amount;
// memberPriceSum += double.parse(value1.amountHasOrderList[0]
// .specModel.memberPrice ==
// '0' ||
// value1.amountHasOrderList[0].specModel
// .memberPrice ==
// null
// ? value1.amountHasOrderList[0].specModel.price
// : value1
// .amountHasOrderList[0].specModel.memberPrice) *
// value1.amountHasOrderList[0].amount *
// element.amountHasOrderList[0].amount;
// });
// });
element.cookList.forEach((cooklist) {
//同一分类
cooklist.cookbooklist.forEach((value1) {
// priceSum += double.parse(value1.price) *
// value1.amount *
// element.amount;
// memberPriceSum += double.parse(value1.member_price) *
// value1.amount *
// element.amount;
priceSum += double.parse(
value1.amountHasOrderList[0].specModel.price) *
value1.amountHasOrderList[0].amount *
element.amountHasOrderList[0].amount;
memberPriceSum += double.parse(value1.amountHasOrderList[0]
.specModel.memberPrice ==
'0' ||
value1.amountHasOrderList[0].specModel
.memberPrice ==
null
? value1.amountHasOrderList[0].specModel.price
: value1
.amountHasOrderList[0].specModel.memberPrice) *
value1.amountHasOrderList[0].amount *
element.amountHasOrderList[0].amount;
if (value1.amountHasOrderList != null &&
value1.amountHasOrderList.length > 0) {
value1.amountHasOrderList.forEach((element1) {
priceSum += double.parse(element1.specModel.price) *
element.amountHasOrderList[0].amount *
element1.amount;
memberPriceSum += double.parse(
element1.specModel.memberPrice == '0' ||
element1.specModel.memberPrice == null
? element1.specModel.price
: element1.specModel.memberPrice) *
element.amountHasOrderList[0].amount *
element1.amount;
});
}
});
});
}
... ... @@ -680,6 +775,22 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
if (hasmMenu) {
//单品此类有选中菜品
// element.cookbooklist.forEach((value) {
// value.amountHasOrderList.forEach((element) {
// priceSum += double.parse(element.specModel.price) * element.amount;
// memberPriceSum += double.parse(
// element.specModel.memberPrice == null ||
// element.specModel.memberPrice == '0'
// ? element.specModel.price
// : element.specModel.memberPrice) *
// element.amount;
// });
// // if (value.amount > 0) {
// // priceSum += double.parse(value.price) * value.amount;
// // memberPriceSum += double.parse(value.member_price) * value.amount;
// // }
// });
element.cookbooklist.forEach((value) {
value.amountHasOrderList.forEach((element) {
priceSum += double.parse(element.specModel.price) * element.amount;
... ... @@ -690,10 +801,6 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
: element.specModel.memberPrice) *
element.amount;
});
// if (value.amount > 0) {
// priceSum += double.parse(value.price) * value.amount;
// memberPriceSum += double.parse(value.member_price) * value.amount;
// }
});
}
});
... ... @@ -783,7 +890,9 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
if (element.className == '套餐') {
List<MenuSunModel> packagelist = [];
element.cookbooklist.forEach((cooklist) {
if (cooklist.amount > 0) {
if (cooklist.amountHasOrderList != null &&
cooklist.amountHasOrderList.length > 0 &&
cooklist.amountHasOrderList[0].amount > 0) {
packagelist.add(cooklist);
}
});
... ... @@ -795,7 +904,9 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
} else if (element.className == '我的排菜') {
List<MenuSunModel> planlist = [];
element.cookbooklist.forEach((cooklist) {
if (cooklist.amount > 0) {
if (cooklist.amountHasOrderList != null &&
cooklist.amountHasOrderList.length > 0 &&
cooklist.amountHasOrderList[0].amount > 0) {
planlist.add(cooklist);
}
});
... ... @@ -804,12 +915,36 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
} else {
params['plan_list'] = null;
}
} else if (element.className == '店内常点') {
List<MenuSunModel> oftenlist = [];
element.cookbooklist.forEach((cooklist) {
if (cooklist.amountHasOrderList != null &&
cooklist.amountHasOrderList.length > 0 &&
cooklist.amountHasOrderList[0].amount > 0) {
oftenlist.add(cooklist);
}
});
if (oftenlist.length > 0) {
params['often_list'] = json.encode(oftenlist);
} else {
params['often_list'] = null;
}
} else if (element.className == '临时加菜') {
//临时加菜
temporarylist.addAll(element.cookbooklist);
// if (temporarylist.length > 0) {
// temporarylist.removeWhere((value) => value.amount == 0);
// if (temporarylist.length > 0) {
// params['temporary_list'] = json.encode(temporarylist);
// } else {
// params['temporary_list'] = null;
// }
// }
if (temporarylist.length > 0) {
temporarylist.removeWhere((value) => value.amount == 0);
temporarylist.removeWhere((value) =>
value.amountHasOrderList == null ||
value.amountHasOrderList.length == 0);
if (temporarylist.length > 0) {
params['temporary_list'] = json.encode(temporarylist);
} else {
... ... @@ -818,10 +953,27 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
}
} else {
//单品
// cooklistdata.add(element);
// if (cooklistdata.length > 0) {
// cooklistdata.forEach((cooklist) {
// cooklist.cookbooklist.removeWhere((element) => element.amount == 0);
// });
// if (cooklistdata.length > 0) {
// params['cooklist'] = json.encode(cooklistdata);
// } else {
// params['cooklist'] = null;
// }
// }
cooklistdata.add(element);
if (cooklistdata.length > 0) {
cooklistdata.forEach((cooklist) {
cooklist.cookbooklist.removeWhere((element) => element.amount == 0);
cooklist.cookbooklist.forEach((element) {
element.amountHasOrderList
.removeWhere((element) => element.amount == 0);
});
cooklist.cookbooklist.removeWhere((element) =>
element.amountHasOrderList == null ||
element.amountHasOrderList.length == 0);
});
if (cooklistdata.length > 0) {
params['cooklist'] = json.encode(cooklistdata);
... ... @@ -1019,9 +1171,19 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
() {
//遍历将要被删除的列表,计算页面显示数值
carSum -=
menuSunModelF
.moreSum;
// carSum -=
// menuSunModelF
// .moreSum;
menuSunModelF
.cookList
.forEach(
(element) {
carSum -= element
.allSum *
menuSunModelF
.moreSum;
});
dataLocalShowMore
.removeAt(
indexMore);
... ... @@ -1135,13 +1297,13 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
// double.parse(element.member_price) * element.amount;
// carSum += element.amount;
menuModel.allSum -= element.amount;
menuModel.allSum -= element.amountHasOrderList[0].amount;
// menuSunModelF.moreSum -= element.amount;
// priceSum -= double.parse(element.price) * element.amount;
// planDishC.text = priceSum.toString();
// memberPriceSum -= double.parse(element.member_price) * element.amount;
carSum -= element.amount;
carSum -= element.amountHasOrderList[0].amount * menuSunModelF.moreSum;
});
dataLocalShowMore[indexMore].cookList.removeAt(indexF);
//爷爷级
... ... @@ -1308,7 +1470,9 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
// menuSunModel
// .member_price);
_calculatePrice();
carSum--;
carSum -=
menuSunModelF
.moreSum;
if (menuSunModel
.amountHasOrderList[
0]
... ... @@ -1470,9 +1634,11 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
// .amount;
// _calculatePrice();
carSum -= menuSunModel
.amountHasOrderList[
0]
.amount;
.amountHasOrderList[
0]
.amount *
menuSunModelF
.moreSum;
if (input ==
0) {
... ... @@ -1529,8 +1695,9 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
// memberPriceSum +=
// double.parse(menuSunModel.member_price) *
// input;
carSum +=
input;
carSum += input *
menuSunModelF
.moreSum;
}
menuSunModel
... ... @@ -1585,7 +1752,9 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
// menuSunModel
// .member_price);
_calculatePrice();
carSum++;
carSum +=
menuSunModelF
.moreSum;
setState(() {});
},
child: Container(
... ... @@ -1690,6 +1859,8 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
menuModel
.allSum -=
element
.amountHasOrderList[
0]
.amount;
// element
... ... @@ -1708,14 +1879,16 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
// .member_price) *
// element
// .amount;
_calculatePrice();
carSum -=
element
.amount;
carSum -= element
.amountHasOrderList[
0]
.amount;
});
dataLocalShowOne
.removeAt(
indexOne);
_calculatePrice();
setState(() {});
});
... ... @@ -2294,10 +2467,13 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
List<MenuModel> showList = [];
dataLocalShowMore.forEach((value) {
// unit = value.amountHasOrderList[0].amount;
value.cookList.forEach((newValue) {
if (showList.length == 0) {
showList
.add(MenuModel.fromJson2(newValue.toJson()));
Map<String, dynamic> map = newValue.toJson();
map['out_all_num'] =
value.amountHasOrderList[0].amount;
showList.add(MenuModel.fromJson3(map));
} else {
bool hasC = false;
showList.forEach((show) {
... ... @@ -2330,16 +2506,20 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
.specModel.specid ==
newcook.amountHasOrderList[0]
.specModel.specid) {
if (oldshow.amount !=
newcook.amount) {
has = true;
oldshow.amountHasOrderList[0]
.amount +=
newcook.amountHasOrderList[0]
.amount;
show.allSum += newcook
.amountHasOrderList[0].amount;
}
// if (oldshow.amount !=
// newcook.amountHasOrderList[0]
// .amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0]
.amount *
value
.amountHasOrderList[0].amount;
oldshow.amountHasOrderList.addAll(
newcook.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0].amount;
// }
}
} else if (oldshow.amountHasOrderList[0]
.practiceModel ==
... ... @@ -2351,31 +2531,41 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
.specModel.specid ==
newcook.amountHasOrderList[0]
.specModel.specid) {
if (oldshow.amount !=
newcook.amountHasOrderList[0]
.amount) {
has = true;
oldshow.amountHasOrderList[0]
.amount +=
newcook.amountHasOrderList[0]
.amount;
show.allSum += newcook
.amountHasOrderList[0].amount;
}
// if (oldshow.amount !=
// newcook.amountHasOrderList[0]
// .amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0]
.amount *
value
.amountHasOrderList[0].amount;
oldshow.amountHasOrderList.addAll(
newcook.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0].amount;
// }
}else{
}
}
}
});
if (!has) {
//旧的里面没有该菜品
newcook.amount =
newcook.amountHasOrderList[0].amount *
value.amountHasOrderList[0].amount;
show.cookbooklist.add(newcook);
}
});
}
});
if (!hasC) {
showList
.add(MenuModel.fromJson2(newValue.toJson()));
Map<String, dynamic> map = newValue.toJson();
map['out_all_num'] =
value.amountHasOrderList[0].amount;
showList.add(MenuModel.fromJson3(map));
}
}
});
... ... @@ -2385,7 +2575,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
dataLocalShowOne.forEach((element) {
if (showList.length == 0) {
showList.add(MenuModel.fromJson2(element.toJson()));
showList.add(MenuModel.fromJson3(element.toJson()));
} else {
bool hasC = false;
showList.forEach((show) {
... ... @@ -2418,15 +2608,18 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
.specModel.specid ==
newcook.amountHasOrderList[0]
.specModel.specid) {
if (oldshow.amount != newcook.amount) {
has = true;
oldshow.amountHasOrderList[0]
.amount +=
newcook
.amountHasOrderList[0].amount;
show.allSum += newcook
.amountHasOrderList[0].amount;
}
// if (oldshow
// .amountHasOrderList[0].amount !=
// newcook
// .amountHasOrderList[0].amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0].amount;
oldshow.amountHasOrderList
.addAll(newcook.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0].amount;
// }
}
} else if (oldshow.amountHasOrderList[0]
.practiceModel ==
... ... @@ -2438,17 +2631,18 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
.specModel.specid ==
newcook.amountHasOrderList[0]
.specModel.specid) {
if (oldshow.amount !=
newcook
.amountHasOrderList[0].amount) {
has = true;
oldshow.amountHasOrderList[0]
.amount +=
newcook
.amountHasOrderList[0].amount;
show.allSum += newcook
.amountHasOrderList[0].amount;
}
// if (oldshow
// .amountHasOrderList[0].amount !=
// newcook
// .amountHasOrderList[0].amount) {
has = true;
oldshow.amount += newcook
.amountHasOrderList[0].amount;
oldshow.amountHasOrderList
.addAll(newcook.amountHasOrderList);
show.allSum += newcook
.amountHasOrderList[0].amount;
// }
}
}
}
... ... @@ -2461,7 +2655,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
}
});
if (!hasC) {
showList.add(MenuModel.fromJson2(element.toJson()));
showList.add(MenuModel.fromJson3(element.toJson()));
}
}
});
... ... @@ -2469,7 +2663,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
// double memberPriceSum = 0; //会员价
// TextEditingController planDishC =
// TextEditingController(); //排菜价
print(showList);
NavigatorUtil.goOrderPreviewPage(context,
object: {'object': showList},
name: planDishName.text,
... ... @@ -2517,16 +2711,34 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
widget.datatemp.forEach((element) {
if (element.className == '套餐' ||
element.className == '我的排菜') {
element.cookbooklist.forEach((elementCook) {
if (elementCook.amountHasOrderList.length > 0) {
elementCook.amountHasOrderList[0].amount = 0;
}
});
dataLocalShowMore.forEach((value) {
element.cookbooklist.forEach((elementCook) {
if (elementCook.amountHasOrderList.length >
0) {
elementCook.amountHasOrderList[0].amount =
0;
}
if (value.id == elementCook.id) {
//同一个套餐
// elementCook.cookList = value.cookList;
elementCook.amount = value.moreSum;
elementCook.amountHasOrderList[0].amount =
value.moreSum;
elementCook.cookList.forEach((oldValue) {
print(dataLocalShowMore);
oldValue.cookbooklist.forEach((oldCook) {
oldCook.amount = 0;
// oldCook.amountHasOrderList[0].amount =
// 0;
// oldCook.amountHasOrderList
// .forEach((elementoldCook) {
// elementoldCook.amount = 0; //置空amount
// });
oldCook.amountHasOrderList = [];
});
print(dataLocalShowMore);
value.cookList.forEach((newValue) {
... ... @@ -2542,8 +2754,143 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
.forEach((newCook) {
if (oldCook.id == newCook.id) {
//同一个菜品
oldCook.amount = newCook.amount;
oldCook.amountHasOrderList
.addAll(newCook
.amountHasOrderList);
// oldCook.amountHasOrderList
// .forEach((oldCookelement) {
// if (oldCookelement
// .practiceModel !=
// null &&
// newCook
// .amountHasOrderList[
// 0]
// .practiceModel !=
// null &&
// oldCookelement
// .specModel !=
// null &&
// newCook
// .amountHasOrderList[
// 0]
// .specModel !=
// null) {
// if (oldCookelement
// .practiceModel
// .practice ==
// newCook
// .amountHasOrderList[
// 0]
// .practiceModel
// .practice &&
// oldCookelement.specModel
// .specid ==
// newCook
// .amountHasOrderList[
// 0]
// .specModel
// .specid) {
// oldCookelement.amount =
// newCook
// .amountHasOrderList[
// 0]
// .amount;
// }
// } else if (oldCookelement
// .practiceModel ==
// null &&
// oldCookelement
// .specModel !=
// null) {
// if (oldCookelement
// .specModel.specid ==
// newCook
// .amountHasOrderList[
// 0]
// .specModel
// .specid) {
// oldCookelement.amount =
// newCook
// .amountHasOrderList[
// 0]
// .amount;
// }
// }
// });
// }
// carSumTemp += newCook.amount;
// if (oldCook.amountHasOrderList[0].practiceModel != null &&
// newCook
// .amountHasOrderList[
// 0]
// .practiceModel !=
// null &&
// oldCook
// .amountHasOrderList[
// 0]
// .specModel !=
// null &&
// newCook
// .amountHasOrderList[
// 0]
// .specModel !=
// null) {
// if (oldCook
// .amountHasOrderList[
// 0]
// .practiceModel
// .practice ==
// newCook
// .amountHasOrderList[
// 0]
// .practiceModel
// .practice &&
// oldCook
// .amountHasOrderList[
// 0]
// .specModel
// .specid ==
// newCook
// .amountHasOrderList[
// 0]
// .specModel
// .specid) {
// oldCook
// .amountHasOrderList[0]
// .amount =
// newCook
// .amountHasOrderList[
// 0]
// .amount;
// }
// } else if (oldCook
// .amountHasOrderList[
// 0]
// .practiceModel ==
// null &&
// oldCook
// .amountHasOrderList[
// 0]
// .specModel !=
// null) {
// if (oldCook
// .amountHasOrderList[0]
// .specModel
// .specid ==
// newCook
// .amountHasOrderList[0]
// .specModel
// .specid) {
// oldCook
// .amountHasOrderList[0]
// .amount =
// newCook
// .amountHasOrderList[
// 0]
// .amount;
// }
// }
}
});
});
... ... @@ -2556,13 +2903,68 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
} else {
//单品
print(dataLocalShowOne);
element.cookbooklist.forEach((old) {
// oldCook.amountHasOrderList[0].amount =
// 0;
old.amountHasOrderList = [];
});
dataLocalShowOne.forEach((one) {
if (element.id == one.id) {
//同一分类
element.cookbooklist.forEach((old) {
// oldCook.amountHasOrderList[0].amount =
// 0;
old.amountHasOrderList = [];
one.cookbooklist.forEach((newvalue) {
if (old.id == newvalue.id) {
old.amount = newvalue.amount;
//同一菜品
old.amountHasOrderList.addAll(
newvalue.amountHasOrderList);
// newvalue.amountHasOrderList
// .forEach((newelement) {
// //
// });
// if (old.amountHasOrderList[0]
// .practiceModel !=
// null &&
// newvalue.amountHasOrderList[0]
// .practiceModel !=
// null &&
// old.amountHasOrderList[0]
// .specModel !=
// null &&
// newvalue.amountHasOrderList[0]
// .specModel !=
// null) {
// if (old.amountHasOrderList[0]
// .practiceModel.practice ==
// newvalue.amountHasOrderList[0]
// .practiceModel.practice &&
// old.amountHasOrderList[0]
// .specModel.specid ==
// newvalue.amountHasOrderList[0]
// .specModel.specid) {
// old.amountHasOrderList[0].amount =
// newvalue.amountHasOrderList[0]
// .amount;
// }
// } else if (old.amountHasOrderList[0]
// .practiceModel ==
// null &&
// old.amountHasOrderList[0]
// .specModel !=
// null) {
// if (old.amountHasOrderList[0]
// .specModel.specid ==
// newvalue.amountHasOrderList[0]
// .specModel.specid) {
// old.amountHasOrderList[0].amount =
// newvalue.amountHasOrderList[0]
// .amount;
// }
// }
}
});
});
... ... @@ -2570,6 +2972,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
});
}
});
print(widget.datatemp);
bool success =
await setPlanCookByReserve(widget.datatemp);
if (success) {
... ...
... ... @@ -61,8 +61,16 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
void initState() {
super.initState();
Utils.changeStatusColor(color: Colors.transparent);
recommendC.text =
'${widget.detailEntity.rnameStr ?? ''}：\n 根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以享受大量优惠！';
String name = widget.detailEntity.rnameStr == null ||
widget.detailEntity.rnameStr == ''
? ''
: '${widget.detailEntity.rnameStr ?? ''}：\n ';
recommendC.text = '${name}根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以享受大量优惠！';
widget.showList.forEach((element) {
element.cookbooklist.forEach((cook) {
element.allsumPreviewShow += cook.amount;
});
});
WidgetsBinding.instance.addPostFrameCallback((_) {
_getNewRechargeList();
});
... ... @@ -89,7 +97,8 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
? '预计可以节约${marketingCenterProvider.rechargeList[index].rechargeList.price}元！'
: '预计可以享受大量优惠！';
String name = widget.detailEntity.rnameStr != null
String name = widget.detailEntity.rnameStr != null &&
widget.detailEntity.rnameStr != ''
? '${widget.detailEntity.rnameStr}：\n'
: '';
... ... @@ -453,7 +462,7 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
.bold),
),
Text(
'${menuModel.allSum}道',
'${menuModel.allsumPreviewShow}道',
style: TextStyle(
fontSize:
font(14),
... ... @@ -536,7 +545,7 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
alignment:
Alignment.centerRight,
child: Text(
'${menuSunModel.amountHasOrderList[0].amount}份',
'${menuSunModel.amount}份',
style: TextStyle(
fontSize: font(12),
color: MyColours
... ...
... ... @@ -66,6 +66,11 @@ class _OrderSharePageState extends State<OrderSharePage> {
void initState() {
super.initState();
Utils.changeStatusColor(color: Colors.transparent);
widget.showList.forEach((element) {
element.cookbooklist.forEach((cook) {
element.allsumPreviewShow += cook.amount;
});
});
WidgetsBinding.instance.addPostFrameCallback((_) {});
}
... ... @@ -400,7 +405,7 @@ class _OrderSharePageState extends State<OrderSharePage> {
FontWeight.bold),
),
Text(
'${menuModel.allSum}道',
'${menuModel.allsumPreviewShow}道',
style: TextStyle(
fontSize: font(14),
color:
... ... @@ -415,6 +420,12 @@ class _OrderSharePageState extends State<OrderSharePage> {
int indexReal = index - 1;
MenuSunModel menuSunModel =
menuModel.cookbooklist[indexReal];
String practice = menuSunModel
.amountHasOrderList[0]
.practiceModel ==
null
? ''
: '(${menuSunModel.amountHasOrderList[0].practiceModel.name})';
return Container(
padding: EdgeInsets.symmetric(
horizontal: w(20), vertical: w(13)),
... ... @@ -431,7 +442,7 @@ class _OrderSharePageState extends State<OrderSharePage> {
// maxWidth: w(80)),
Expanded(
child: Text(
menuSunModel.name,
'${menuSunModel.name}${practice}',
maxLines: 10,
overflow: TextOverflow.ellipsis,
style: TextStyle(
... ... @@ -442,7 +453,11 @@ class _OrderSharePageState extends State<OrderSharePage> {
// _laduWidget(),
Spacer(),
Text(
'${menuSunModel.price}元/${menuSunModel.unit}',
menuSunModel.amountHasOrderList[0]
.specModel ==
null
? '${menuSunModel.price}元/${menuSunModel.unit}'
: '${menuSunModel.amountHasOrderList[0].specModel.price}元/${menuSunModel.amountHasOrderList[0].specModel.specs}',
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
... ...
... ... @@ -8,6 +8,7 @@ import 'package:one_key/models/plan_cook_list_model.dart';
import 'package:one_key/net/base_resp.dart';
import 'package:one_key/net/dio_util.dart';
import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/loading.dart';
import '../constant/constant.dart';
import '../constant/error.dart';
... ... @@ -28,6 +29,7 @@ class PlanDishProvider extends ChangeNotifier {
PageState pageStateMenu = PageState.Loading;
List<MenuModel> menuModel; //菜品数据
List<MenuModel> menuModelOld; //菜品数据
List<MenuModel> menuModelForManager = []; //经理点菜菜品数据
List<SunListPlan> allList = []; //排菜套餐列表--全部
... ... @@ -48,11 +50,11 @@ class PlanDishProvider extends ChangeNotifier {
///分类下所有菜品列表(1.传orderid顾客端获取带订单信息的 否则不传
getCookbookByClass(BuildContext context, Map<String, String> params,
{showLoading = false}) async {
{showLoading = false,selfDismiss= false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_cookbook_by_class,
data: params,
showLoading: pageState == PageState.Loading ? false : showLoading)
showLoading: pageState == PageState.Loading ? false : showLoading,selfDismiss: selfDismiss)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -72,6 +74,7 @@ class PlanDishProvider extends ChangeNotifier {
return false;
});
menuModel = [];
menuModelOld = [];
if (baseResp != null && baseResp.code == Constant.status_success) {
if (baseResp.data[0]['list'] == '') {
... ... @@ -80,6 +83,7 @@ class PlanDishProvider extends ChangeNotifier {
List menu = baseResp.data[0]['list'];
for (int i = 0; i < menu.length; i++) {
menuModel.add(MenuModel.fromJson(menu[i]));
menuModelOld.add(MenuModel.fromJson(menu[i]));
}
print(menuModel);
pageState = PageState.Success;
... ... @@ -136,10 +140,10 @@ class PlanDishProvider extends ChangeNotifier {
/// 根据预定ID获取排菜
getPlanCookByRid(BuildContext context, Map<String, String> params,
{showLoading = false}) async {
{showLoading = false, selfDismiss = false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_plan_cook_by_rid,
data: params, showLoading: showLoading)
data: params, showLoading: showLoading, selfDismiss: selfDismiss)
.catchError((error) {
print(error.toString());
// if (error is MyError) {
... ... @@ -156,6 +160,7 @@ class PlanDishProvider extends ChangeNotifier {
// }
// }
// notifyListeners();
return false;
});
// menuModel = [];
... ... @@ -195,10 +200,12 @@ class PlanDishProvider extends ChangeNotifier {
Future<bool> setPlanCook(BuildContext context, Map<String, String> params,
{showLoading = false}) async {
Loading.showLoading(context);
FormData formData = FormData.fromMap(params);
Response response = await DioUtil.getInstance().getDio().post(
'http://xt04.colorcun.com/?service=App.PlanCook.SetPlanCook',
'http://xt04.colorcun.com/${HttpUrl.set_plan_cook}',
data: formData);
Loading.hideLoading(context);
print(response);
if (response.data != null &&
... ... @@ -229,28 +236,39 @@ class PlanDishProvider extends ChangeNotifier {
Future<bool> setPlanCookByReserve(
BuildContext context, Map<String, String> params,
{showLoading = false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.set_plan_cook_by_reserve,
data: params, showLoading: showLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {}
// return false;
});
Loading.showLoading(context);
FormData formData = FormData.fromMap(params);
Response response = await DioUtil.getInstance().getDio().post(
'http://xt04.colorcun.com/${HttpUrl.set_plan_cook_by_reserve}',
data: formData);
Loading.hideLoading(context);
if (baseResp != null && baseResp.code == Constant.status_success) {
if (baseResp.data == 1) {
print(response);
if (response.data != null &&
response.data['ret'] == Constant.status_success) {
// BaseResp<dynamic> baseResp = await DioUtil()
// .request<dynamic>(context, Method.get, HttpUrl.set_plan_cook_by_reserve,
// data: params, showLoading: showLoading)
// .catchError((error) {
// print(error.toString());
// if (error is MyError) {}
// // return false;
// });
// if (baseResp != null && baseResp.code == Constant.status_success) {
if (response.data['data'] == 1) {
return true;
}
if (baseResp.data['id'] != null && baseResp.data['id'] != '') {
planId = baseResp.data['id'];
if (response.data['data']['id'] != null &&
response.data['data']['id'] != '') {
planId = response.data['data']['id'];
return true;
}
} else {
if (baseResp == null) {
if (response.data == null) {
Utils.showToast("提交失败,请重试");
} else {
Utils.showToast(baseResp.msg ?? "");
Utils.showToast(response.data['msg'] ?? "");
}
return false;
... ... @@ -281,7 +299,7 @@ class PlanDishProvider extends ChangeNotifier {
///排菜/套餐列表
Future<bool> getPlanCookList(BuildContext context, Map<String, String> params,
{showLoading = false}) async {
{showLoading = false,selfDismiss = false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_plan_cook_list,
data: params,
... ... @@ -289,7 +307,7 @@ class PlanDishProvider extends ChangeNotifier {
pageStateHome == PageState.Loading ||
pageStateMine == PageState.Loading
? false
: showLoading)
: showLoading,selfDismiss:selfDismiss)
.catchError((error) {
print(error.toString());
if (error is MyError) {}
... ...
... ... @@ -2092,7 +2092,7 @@ var orderPreviewPageHandle = new Handler(
// MenuModel menuModel = MenuModel.fromJson2(item);
// res.add(menuModel);
// print(res);
res.add(MenuModel.fromJson2(item));
res.add(MenuModel.fromJson5(item));
}
}
String priceSum = params["priceSum"].first;
... ...
... ... @@ -1224,7 +1224,8 @@ class Utils {
// String _thumbnail = sellerImage == null || sellerImage == ''
// ? 'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'
// : sellerImage;
String _thumbnail = 'https://nosqn.colorcun.com/share_advanced_order.png';
String _thumbnail =
'https://nosqn.colorcun.com/share_advanced_order_new.png';
String _title = title;
String _userName = "gh_487873d353b3";
// String _path = "pack-cookbook/pages/index?rid=$rid&identity=2&sid=$sid";
... ... @@ -1234,8 +1235,8 @@ class Utils {
String _description = "OneKey";
// Uint8List source = await testComporessList(context, _thumbnail);
var model = new WeChatShareMiniProgramModel(
miniProgramType: WXMiniProgramType.PREVIEW, //体验版
// miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
webPageUrl: _webPageUrl,
userName: _userName,
... ... @@ -1263,7 +1264,8 @@ class Utils {
// String _thumbnail = sellerImage == null || sellerImage == ''
// ? 'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'
// : sellerImage;
String _thumbnail = 'https://nosqn.colorcun.com/share_advanced_order.png';
String _thumbnail =
'https://nosqn.colorcun.com/share_advanced_order_new.png';
String _title = title;
String _userName = "gh_487873d353b3";
... ... @@ -1274,7 +1276,7 @@ class Utils {
String _description = "OneKey";
// Uint8List source = await testComporessList(context, _thumbnail);
var model = new WeChatShareMiniProgramModel(
miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: WXMiniProgramType.RELEASE,
webPageUrl: _webPageUrl,
userName: _userName,
title: _title,
... ... @@ -1603,8 +1605,8 @@ class Utils {
title: _title,
path: _path,
description: _description,
miniProgramType: WXMiniProgramType.PREVIEW, //体验版
// miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
// thumbnail: WeChatImage.binary(source)
thumbnail: WeChatImage.network(_thumbnail)
... ... @@ -1687,8 +1689,8 @@ class Utils {
title: 'ff',
path: _path,
description: 'hhh',
miniProgramType: WXMiniProgramType.PREVIEW, //体验版
// miniProgramType: WXMiniProgramType.RELEASE //正式版
// miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
// thumbnail: WeChatImage.binary(source)
thumbnail: WeChatImage.network(_thumbnail),
... ... @@ -1742,8 +1744,8 @@ class Utils {
title: _title,
path: _path,
description: _description,
miniProgramType: WXMiniProgramType.PREVIEW, //体验版
// miniProgramType: WXMiniProgramType.RELEASE //正式版
// miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
// thumbnail: WeChatImage.binary(source)
thumbnail: WeChatImage.network(_thumbnail)
... ... @@ -1796,8 +1798,8 @@ class Utils {
title: _title,
path: _path,
description: _description,
miniProgramType: WXMiniProgramType.PREVIEW, //体验版
// miniProgramType: WXMiniProgramType.RELEASE //正式版
// miniProgramType: WXMiniProgramType.PREVIEW, //体验版
miniProgramType: WXMiniProgramType.RELEASE, //正式版
// miniProgramType: WXMiniProgramType.TEST //开发版
// thumbnail: WeChatImage.binary(source)
thumbnail: WeChatImage.network(_thumbnail)
... ...