店内常点

@@ -41,7 +41,7 @@ class PlanCookByRidSunModel {
   String serve;
   String serve;
   List<MenuModel> cooklist;
   List<MenuModel> cooklist;
   List<MenuSunModel> packageList;
   List<MenuSunModel> packageList;
-  // Null? oftenList;
+  List<MenuSunModel> oftenList;
 
 
   List<MenuSunModel> temporaryList;
   List<MenuSunModel> temporaryList;
   List<MenuSunModel> planList;
   List<MenuSunModel> planList;
@@ -67,7 +67,7 @@ class PlanCookByRidSunModel {
       this.serve,
       this.serve,
       this.cooklist,
       this.cooklist,
       this.packageList,
       this.packageList,
-      // this.oftenList,
+      this.oftenList,
       this.temporaryList,
       this.temporaryList,
       this.planList,
       this.planList,
       this.menuPrice,
       this.menuPrice,
@@ -114,6 +114,18 @@ class PlanCookByRidSunModel {
       }
       }
     }
     }
     // oftenList = json['often_list'];
     // oftenList = json['often_list'];
+    if (json1['often_list'] != null && json1['often_list'] != '') {
+      oftenList = <MenuSunModel>[];
+      if (json1['often_list'] is List) {
+        json1['often_list'].forEach((v) {
+          oftenList.add(new MenuSunModel.fromJson2(v));
+        });
+      } else {
+        json.decode(json1['often_list']).forEach((v) {
+          oftenList.add(new MenuSunModel.fromJson2(v));
+        });
+      }
+    }
 
 
     if (json1['temporary_list'] != null && json1['temporary_list'] != '') {
     if (json1['temporary_list'] != null && json1['temporary_list'] != '') {
       temporaryList = <MenuSunModel>[];
       temporaryList = <MenuSunModel>[];
@@ -163,7 +175,7 @@ class PlanCookByRidSunModel {
     data['serve'] = this.serve;
     data['serve'] = this.serve;
     data['cooklist'] = this.cooklist;
     data['cooklist'] = this.cooklist;
     data['package_list'] = this.packageList;
     data['package_list'] = this.packageList;
-    // data['often_list'] = this.oftenList;
+    data['often_list'] = this.oftenList;
     data['temporary_list'] = this.temporaryList;
     data['temporary_list'] = this.temporaryList;
     data['plan_list'] = this.planList;
     data['plan_list'] = this.planList;
     data['menu_price'] = this.menuPrice;
     data['menu_price'] = this.menuPrice;

@@ -132,7 +132,7 @@ class SellerOftenSunCooklist {
 
 
   SellerOftenSunCooklist.fromJson(Map<String, dynamic> json) {
   SellerOftenSunCooklist.fromJson(Map<String, dynamic> json) {
     amount = json['amount'] == null || json['amount'] == ''
     amount = json['amount'] == null || json['amount'] == ''
-        ? 0
+        ? 1
         : int.parse(json['amount']);
         : int.parse(json['amount']);
     sid = json['sid'];
     sid = json['sid'];
     cookbookid = json['cookbookid'];
     cookbookid = json['cookbookid'];

@@ -221,32 +221,32 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
           // menuSunModel.amount = element.amount;
           // menuSunModel.amount = element.amount;
           // menuSunModel.cookList = element.cookList;
           // menuSunModel.cookList = element.cookList;
 
 
-          // if (widget.planCookByRidSunModel != null &&
-          //     widget.planCookByRidSunModel.packageList != null &&
-          //     widget.planCookByRidSunModel.packageList.length > 0) {
-          //   //套餐数据对应
-          //   widget.planCookByRidSunModel.packageList.forEach((package) {
-          //     if (package.id == menuSunModel.id) {
-          //       //同一个套餐
-          //       menuSunModel.amount = package.amount;
-          //       menuSunModel.cookList.forEach((oldcooklist) {
-          //         package.cookList.forEach((newcooklist) {
-          //           if (oldcooklist.id == newcooklist.id) {
-          //             //同一菜品分类
-          //             oldcooklist.cookbooklist.forEach((oldcook) {
-          //               newcooklist.cookbooklist.forEach((newcook) {
-          //                 if (oldcook.id == newcook.id) {
-          //                   oldcook.amount = newcook.amount;
-          //                   carSum += newcook.amount;
-          //                 }
-          //               });
-          //             });
-          //           }
-          //         });
-          //       });
-          //     }
-          //   });
-          // }
+          if (widget.planCookByRidSunModel != null &&
+              widget.planCookByRidSunModel.oftenList != null &&
+              widget.planCookByRidSunModel.oftenList.length > 0) {
+            //   //店内常点数据对应
+            widget.planCookByRidSunModel.oftenList.forEach((package) {
+              if (package.id == element.id) {
+                //同一个套餐
+                element.amount = package.amount;
+                element.cookList.forEach((oldcooklist) {
+                  package.cookList.forEach((newcooklist) {
+                    if (oldcooklist.id == newcooklist.id) {
+                      //同一菜品分类
+                      oldcooklist.cookbooklist.forEach((oldcook) {
+                        newcooklist.cookbooklist.forEach((newcook) {
+                          if (oldcook.id == newcook.id) {
+                            oldcook.amount = newcook.amount;
+                            carSum += newcook.amount;
+                          }
+                        });
+                      });
+                    }
+                  });
+                });
+              }
+            });
+          }
 
 
           // cookListStoreOften.add(menuSunModel);
           // cookListStoreOften.add(menuSunModel);
           // }
           // }