Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -256,12 +256,6 @@
           this.list.forEach(item => {
             item.DiningSummaryList.forEach(insideItem => {
               insideItem.OrderState = 0;
-              if (!insideItem.Discount) {
-                insideItem.Discount = 0;
-              }
-              if (!insideItem.DiscountPrice) {
-                insideItem.DiscountPrice = 0;
-              }
             })
           })
         }
@@ -269,15 +263,23 @@
           this.list.forEach(item => {
             item.DiningSummaryList.forEach(insideItem => {
               insideItem.OrderState = 1;
-              if (!insideItem.Discount) {
-                insideItem.Discount = 0;
+            })
+          })
+        }
+        this.list.forEach(item => {
+          item.DiningSummaryList.forEach(insideItem => {
+            if (insideItem.DiningPriceList) {
+              insideItem.DiningPriceList.forEach(subItem => {
+                if (!subItem.Discount) {
+                  subItem.Discount = 0;
                 }
-              if (!insideItem.DiscountPrice) {
-                insideItem.DiscountPrice = 0;
+                if (!subItem.DiscountPrice) {
+                  subItem.DiscountPrice = 0;
+                }
+              });
             }
           })
         })
-        }
         this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => {
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message);