1班号+提成调整

Edu.Model/Entity/DataStatistics/RB_Edu_RevenueReport.cs

@@ -185,5 +185,10 @@ namespace Edu.Model.Entity.Finance
         /// </summary>
         public int DateType { get; set; }
 
+        /// <summary>
+        /// 班号
+        /// </summary>
+        public string ClassNo { get; set; }
+
     }
 }

Edu.Module.Finance/FinanceModule.cs

@@ -364,6 +364,7 @@ namespace Edu.Module.Finance
                     #region 初始化数据
                     demodel.ClassBegins = item.OpenTime;
                     demodel.ClassName = item.ClassName;
+                    demodel.ClassNo = item.ClassNo;
                     demodel.ClassState = (int)item.ClassStatus;
                     demodel.CourseId = item.CouseId;
                     demodel.CourseName = item.CourseName;
@@ -391,7 +392,7 @@ namespace Edu.Module.Finance
                     demodel.QTShouRu = cfinanceList.Where(y => y.Is_Cashier == 1).Sum(x => x.Money ?? 0);
                     demodel.QTShouRu -= cfinanceList.Where(x => x.Is_Cashier == 1 && x.Fee > 0).GroupBy(x => new { x.FrID, x.Fee }).Sum(x => x.Key.Fee ?? 0);
                     //支出
-                    demodel.TiCheng = orderList.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney);//销售提成
+                    demodel.TiCheng = orderList.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney + x.ExtraCommissionMoney);//销售提成
                     demodel.ClassFee = teacherBonusList.Where(x => x.ClassId == item.ClassId).Sum(x => x.Money);//老师提成
                     demodel.JiXiaoMoney = meritsProfitList.Where(x => x.ClassId == item.ClassId && x.PerfState == Common.Enum.Course.PerfStateEnum.Confirmed).OrderByDescending(x => x.CreateTime).FirstOrDefault()?.Money ?? 0;//绩效提成
 

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -97,7 +97,7 @@ namespace Edu.WebApi.Controllers.Finance
             ProfitNow = (IncomeActual + OtherIncomeActual) - PayActual;
 
             //提成
-            decimal SaleCommission = (orderList != null && orderList.Any()) ? orderList.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney) : 0; ;//销售提成
+            decimal SaleCommission = (orderList != null && orderList.Any()) ? orderList.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney + x.ExtraCommissionMoney) : 0;//销售提成
             var teacherProfitList = teachingRewardsModule.GetBonusDetailList(new RB_Teaching_BonusDetail_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId });
             decimal TeacherProfitNow = (teacherProfitList != null && teacherProfitList.Any()) ? teacherProfitList.Sum(x => x.Money) : 0;//老师提成
 
@@ -746,8 +746,9 @@ namespace Edu.WebApi.Controllers.Finance
             {
                 ExcelRows = new List<ExcelColumn>(30) {
                     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 = 10, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                    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 },
@@ -794,7 +795,8 @@ namespace Edu.WebApi.Controllers.Finance
                     {
                         ExcelRows = new List<ExcelColumn>(30) {
                             new ExcelColumn(value: item.Id == -1 ? "合计" : item.SchoolName){ },
-                            new ExcelColumn(value: item.ClassId.ToString()){ },
+                            new ExcelColumn(value: item.Id == -1 ? "" : item.ClassId.ToString()){ },
+                            new ExcelColumn(value: item.ClassNo){ },
                             new ExcelColumn(value: item.ClassName){ },
                             new ExcelColumn(value: item.ClassBeginsStr){ },
                             new ExcelColumn(value: ClassState){ },