部分代码修改

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -439,7 +439,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 else
                 {
-                    _TableInitialization.RemoveAll(x => x.Id == 1070 || x.Id == 1071);
+                    _TableInitialization.RemoveAll(x => weikuanSign.Contains(x.Id));
+                    checkedItem.RemoveAll(x => x == "尾款金额" || x == "其他额外费用");
+                    checkedItemId.RemoveAll(x => weikuanSign.Contains(x));
                 }
 
                 //三公费用金额以及币种
@@ -887,8 +889,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         //93 , 989
                         bool isExistsWu = carTouristList.Where(x => x.SId == mealsDic[93] && x.IsDel == 0 && DateTime.Compare(start, x.DatePrice.ObjToDate()) == 0 && x.Price > 0).Count() == 0;
                         bool isExistsWan = carTouristList.Where(x => x.SId == mealsDic[989] && x.IsDel == 0 && DateTime.Compare(start, x.DatePrice.ObjToDate()) == 0 && x.Price > 0).Count() == 0;
-                        var mealPriceWu = carTouristList.Where(x => x.SId == 93 && x.IsDel == 0 && DateTime.Compare(start, x.DatePrice.ObjToDate()) == 0).Sum(x => x.Price);
-                        var mealPriceWan = carTouristList.Where(x => x.SId == 989 && x.IsDel == 0 && DateTime.Compare(start, x.DatePrice.ObjToDate()) == 0).Sum(x => x.Price);
+                        var mealPriceWu = carTouristList.Where(x => x.SId == 93 && x.IsDel == 0 && DateTime.Compare(start, x.DatePrice.ObjToDate()) == 0).Sum(x => x.Price * x.Count);
+                        var mealPriceWan = carTouristList.Where(x => x.SId == 989 && x.IsDel == 0 && DateTime.Compare(start, x.DatePrice.ObjToDate()) == 0).Sum(x => x.Price * x.Count);
 
                         if (isExistsWu && isExistsWan)
                         {