1

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1773,6 +1773,8 @@ 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 },
                 }
             };
             slist.Add(header);
@@ -1838,6 +1840,8 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: item?.RectorRemarkList.FirstOrDefault()?.Content??""){ },
                             new ExcelColumn(value: item?.DirectorRemarkList.FirstOrDefault()?.Content??""){ },
                             new ExcelColumn(value: item.ClassScrollType == 2 ?"约课":"跟班"){ },
+                            new ExcelColumn(value: item.BrokerageMoney.ToString("#0.00")){ },
+                            new ExcelColumn(value: item.YFCommission.ToString("#0.00")){ },
                         }
                     };
                     slist.Add(firstRow);
@@ -1873,6 +1877,8 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: list.Sum(x=>x.BrokerageMoney).ToString("#0.00")){ },
+                            new ExcelColumn(value: list.Sum(x=>x.YFCommission).ToString("#0.00")){ },
                         }
                 };
                 slist.Add(firstRowT);
@@ -2191,7 +2197,10 @@ namespace Edu.WebApi.Controllers.Course
                 ExcelRows = new List<ExcelColumn>(30) {
                     new ExcelColumn(value:"订单号"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                     new ExcelColumn(value:"下单日期"){CellWidth=20,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 },
@@ -2209,6 +2218,8 @@ 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 },
                 }
             };
             slist.Add(header);
@@ -2245,8 +2256,11 @@ namespace Edu.WebApi.Controllers.Course
                         {
                             new ExcelColumn(value: item.OrderId.ToString()){ },
                             new ExcelColumn(value: item.CreateTime.ToString("yyyy-MM-dd HH:mm")){ },
-                            new ExcelColumn(value: item.EnterName){ },
-                            new ExcelColumn(value: item.CourseName){ },
+                            new ExcelColumn(value: (item.CreateBy > 0 ? UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "" : "")){ },
+                            new ExcelColumn(value: (item.EnterID > 0 ? UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "" : "")){ },
+                            new ExcelColumn(value: (item.CourseConsultantId > 0 ? UserReidsCache.GetUserLoginInfo(item.CourseConsultantId)?.AccountName ?? "" : "")){ },
+                            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.Unit_Price.ToString("#0.00")){ },
@@ -2263,6 +2277,8 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: item?.TeacherRemarkList.FirstOrDefault()?.Content??""){ },
                             new ExcelColumn(value: item?.RectorRemarkList.FirstOrDefault()?.Content??""){ },
                             new ExcelColumn(value: item?.DirectorRemarkList.FirstOrDefault()?.Content??""){ },
+                            new ExcelColumn(value: item.BrokerageMoney.ToString("#0.00")){ },
+                            new ExcelColumn(value: item.YFCommission.ToString("#0.00")){ },
                         }
                     };
                     slist.Add(firstRow);
@@ -2276,6 +2292,9 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: list.Sum(x=>x.GuestNum).ToString()){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
@@ -2292,6 +2311,8 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: list.Sum(x=>x.BrokerageMoney).ToString("#0.00")){ },
+                            new ExcelColumn(value: list.Sum(x=>x.YFCommission).ToString("#0.00")){ },
                         }
                 };
                 slist.Add(firstRowT);