Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -649,7 +649,7 @@ namespace Edu.WebApi.Controllers.Course
             demodel.CreateTime = DateTime.Now;
             demodel.UpdateBy = userInfo.Id;
             demodel.UpdateTime = DateTime.Now;
-           
+
             var flag = false;
             string message = "";
 
@@ -1956,6 +1956,7 @@ namespace Edu.WebApi.Controllers.Course
                     new ExcelColumn(value:"成交单价"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"教材费"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"课件费"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                     new ExcelColumn(value:"总课时"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"应收总额"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"实收"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"优惠金额"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
@@ -2021,10 +2022,11 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: item.OpenTime.ToString("yyyy-MM-dd")){ },
                             new ExcelColumn(value: item.CourseName){ },
                             new ExcelColumn(value: item.GuestNum.ToString()){ },
-                            new ExcelColumn(value: item.Class_Price.ToString("#0.00")){ },
+                            new ExcelColumn(value: item.Class_Price.ToString("#0.00")+"\r\n"+(item.SellPriceType==2?"课时单价":"课时总价")){ },
                             new ExcelColumn(value: item.Unit_Price.ToString("#0.00")){ },
                             new ExcelColumn(value: item.TextbookFee.ToString("#0.00")){ },
                             new ExcelColumn(value: item.CoursewareFee.ToString("#0.00")){ },
+                            new ExcelColumn(value: Convert.ToInt32(item.TotalClassHours).ToString("")){ },
                             new ExcelColumn(value: item.PreferPrice.ToString("#0.00")){ },
                             new ExcelColumn(value: item.Income.ToString("#0.00")){ },
                             new ExcelColumn(value: item.DiscountMoney.ToString("#0.00")){ },
@@ -2064,6 +2066,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: list.Sum(x=>x.TextbookFee).ToString("#0.00")){ },
                             new ExcelColumn(value: list.Sum(x=>x.CoursewareFee).ToString("#0.00")){ },
+                              new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: list.Sum(x=>x.PreferPrice).ToString("#0.00")){ },
                             new ExcelColumn(value: list.Sum(x=>x.Income).ToString("#0.00")){ },
                             new ExcelColumn(value: list.Sum(x=>x.DiscountMoney).ToString("#0.00")){ },
@@ -2248,7 +2251,10 @@ namespace Edu.WebApi.Controllers.Course
                         z.GuestName,
                         z.GuestState
                     }),
-                    x.StudyBroadRebateMoney
+                    x.StudyBroadRebateMoney,
+                    x.TotalClassHours,
+                    x.TextbookFee,
+                    x.CoursewareFee,
                 })
             };
             return ApiResult.Success("", pageModel);
@@ -2381,6 +2387,9 @@ namespace Edu.WebApi.Controllers.Course
                         z.GuestState
                     }),
                     x.StudyBroadRebateMoney,
+                    x.TextbookFee,
+                    x.CoursewareFee,
+                    x.TotalClassHours,
                 })
             };
             return ApiResult.Success("", pageModel);
@@ -2407,6 +2416,9 @@ namespace Edu.WebApi.Controllers.Course
                     new ExcelColumn(value:"项目"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"人数"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"单价"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                    new ExcelColumn(value:"教材费"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                    new ExcelColumn(value:"课件费"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                    new ExcelColumn(value:"总课时"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"成交单价"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"应收总额"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"实收"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
@@ -2465,7 +2477,10 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: (item.HelpEnterId > 0 ? UserReidsCache.GetUserLoginInfo(item.HelpEnterId)?.AccountName ?? "" : "")){ },
                             new ExcelColumn(value: item.StudyName){ },
                             new ExcelColumn(value: item.GuestNum.ToString()){ },
-                            new ExcelColumn(value: item.Class_Price.ToString("#0.00")){ },
+                            new ExcelColumn(value: item.Class_Price.ToString("#0.00")+"\r\n"+(item.SellPriceType==2?"课时单价":"课时总价")){ },
+                            new ExcelColumn(value: item.TextbookFee.ToString("#0.00")){ },
+                            new ExcelColumn(value: item.CoursewareFee.ToString("#0.00")){ },
+                            new ExcelColumn(value: Convert.ToInt32(item.TotalClassHours).ToString("")){ },
                             new ExcelColumn(value: item.Unit_Price.ToString("#0.00")){ },
                             new ExcelColumn(value: item.PreferPrice.ToString("#0.00")){ },
                             new ExcelColumn(value: item.Income.ToString("#0.00")){ },
@@ -2501,6 +2516,9 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: list.Sum(x=>x.GuestNum).ToString()){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: list.Sum(x=>x.PreferPrice).ToString("#0.00")){ },
                             new ExcelColumn(value: list.Sum(x=>x.Income).ToString("#0.00")){ },
                             new ExcelColumn(value: list.Sum(x=>x.DiscountMoney).ToString("#0.00")){ },