1

Edu.Model/Entity/Course/RB_Course.cs

@@ -361,5 +361,10 @@ namespace Edu.Model.Entity.Course
         /// 赠送咖啡劵数量
         /// </summary>
         public int FreeCoffeeNum { get; set; }
+
+        /// <summary>
+        /// 课程增加课时费
+        /// </summary>
+        public decimal AddHoursMoney { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Grade/RB_Class_Check_ViewModel.cs

@@ -165,6 +165,11 @@ namespace Edu.Model.ViewModel.Grade
         /// </summary>
         public int BaseHoursAdd { get; set; }
 
+        /// <summary>
+        /// 课程增加课时费
+        /// </summary>
+        public decimal CourseAddHoursMoney { get; set; }
+
         /// <summary>
         /// 班级课时分钟数
         /// </summary>

Edu.Model/ViewModel/Grade/RB_Class_Plan_ViewModel.cs

@@ -199,5 +199,10 @@ namespace Edu.Model.ViewModel.Grade
         /// 类型  0正常   1跟班
         /// </summary>
         public int ReserveType { get; set; }
+
+        /// <summary>
+        /// 课程增加课时费
+        /// </summary>
+        public decimal CourseAddHoursMoney { get; set; }
     }
 }

Edu.Module.Course/TeachingRewardsModule.cs

@@ -585,7 +585,7 @@ namespace Edu.Module.Course
 
                         var typeModel = typeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
 
-                        decimal unitPrice = configModel.BasicHourFee + (typeModel?.AddHourFee ?? 0) + (item?.BaseHourFee ?? 0);
+                        decimal unitPrice = configModel.BasicHourFee + (typeModel?.AddHourFee ?? 0) + (item?.BaseHourFee ?? 0) + (item?.CourseAddHoursMoney ?? 0);
                         //课时费  需要每个班级  单独计算  因为 班级有附加费用
                         decimal KSMoney = KSNum * unitPrice;
 
@@ -644,6 +644,7 @@ namespace Edu.Module.Course
             try
             {
                 decimal TotalMoney = 0;
+                List<RB_Class_Check_ViewModel> InList = new List<RB_Class_Check_ViewModel>();
                 //基础课
                 foreach (var item in plist)
                 {
@@ -655,14 +656,22 @@ namespace Edu.Module.Course
                     }
                     else
                     {
+                        //跟班  一天统计一次就好~
+                        if (InList.Where(x => x.TeacherId == item.TeacherId && x.ClassId == item.ClassId && x.ClassDate == item.ClassDate).Any()) { continue; }
                         dateqList = DateList.Where(x => x.TeacherId == item.TeacherId && x.ClassId == item.ClassId && x.Date == item.ClassDate).ToList();
+                        InList.Add(new RB_Class_Check_ViewModel()
+                        {
+                            TeacherId = item.TeacherId,
+                            ClassId = item.ClassId,
+                            ClassDate = item.ClassDate
+                        });
                     }
                     //查询课时
                     decimal ksNum = dateqList.Sum(x => x.KSNum); 
                     //查询课单价
                     var typeModel = typeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
                     var teacherModel = teacherList.Where(x => x.TId == item.TeacherId).FirstOrDefault();
-                    decimal unitPrice = configModel.BasicHourFee + (typeModel?.AddHourFee ?? 0) + (teacherModel?.BaseHourFee ?? 0);
+                    decimal unitPrice = configModel.BasicHourFee + (typeModel?.AddHourFee ?? 0) + (teacherModel?.BaseHourFee ?? 0) + (item?.CourseAddHoursMoney ?? 0);
                     //签到人数
                     int CheckNum = 0;
                     if (item.PlanType == 2)

Edu.Module.Finance/FinanceModule.cs

@@ -3147,7 +3147,7 @@ namespace Edu.Module.Finance
 
                         var typeModel = cTypeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
 
-                        decimal unitPrice = configModel.BasicHourFee + (typeModel?.AddHourFee ?? 0) + (item?.BaseHourFee ?? 0);
+                        decimal unitPrice = configModel.BasicHourFee + (typeModel?.AddHourFee ?? 0) + (item?.BaseHourFee ?? 0) + (item?.CourseAddHoursMoney ?? 0);
                         //课时费  需要每个班级  单独计算  因为 班级有附加费用
                         decimal KSMoney = KSNum * unitPrice;
 
@@ -3536,7 +3536,7 @@ namespace Edu.Module.Finance
 
                     var typeModel = cTypeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
 
-                    decimal unitPrice = configModel.BasicHourFee + (typeModel?.AddHourFee ?? 0) + (item?.BaseHourFee ?? 0);
+                    decimal unitPrice = configModel.BasicHourFee + (typeModel?.AddHourFee ?? 0) + (item?.BaseHourFee ?? 0) + (item?.CourseAddHoursMoney ?? 0);
                     //课时费  需要每个班级  单独计算  因为 班级有附加费用
                     decimal KSMoney = KSNum * unitPrice;
 

Edu.Repository/Course/RB_CourseRepository.cs

@@ -302,6 +302,7 @@ WHERE 1=1
                     {nameof(RB_Course_ViewModel.CourseTimeId),model.CourseTimeId },
                     {nameof(RB_Course_ViewModel.OpenBankLevel),model.OpenBankLevel },
                     {nameof(RB_Course_ViewModel.FreeCoffeeNum),model.FreeCoffeeNum },
+                    {nameof(RB_Course_ViewModel.AddHoursMoney),model.AddHoursMoney },
                 };
                 flag = base.Update(fileds, new WhereHelper(nameof(RB_Course_ViewModel.CourseId), model.CourseId));
             }

Edu.Repository/Grade/RB_Class_CheckRepository.cs

@@ -562,7 +562,7 @@ GROUP BY tt.TeacherId,tt.OrderGuestId
             }
 
             string sql = $@"
-SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,t2.BaseHoursEnabled,t2.EnableTime,t2.BaseHoursAdd,if(cp.PlanType=2,'预约课',c.ClassName) as ClassName,if(cp.PlanType=2,co2.CourseName,co.CourseName) as CourseName,p.ClassId,
+SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,t2.BaseHoursEnabled,t2.EnableTime,t2.BaseHoursAdd,if(cp.PlanType=2,'预约课',c.ClassName) as ClassName,if(cp.PlanType=2,co2.CourseName,co.CourseName) as CourseName,p.ClassId,if(cp.PlanType=2,co2.AddHoursMoney,co.AddHoursMoney) as CourseAddHoursMoney,
 c.ClassType,c.ClassNo,if(cp.PlanType=2,s2.SName,s.SName) as SName,c.ClassHourMinute,if(cp.PlanType=2,cp.CourseId,c.CouseId) as CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate,Max(p.CurrentDeductionHours) as CurrentDeductionHours 
 FROM rb_class_check p
 INNER JOIN rb_class_time t on p.ClassTimeId = t.ClassTimeId
@@ -607,7 +607,7 @@ ORDER BY p.ClassDate ASC
             }
 
             string sql = $@"
-SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,t2.BaseHoursEnabled,t2.EnableTime,if(cp.PlanType=2,'预约课',c.ClassName) as ClassName,if(cp.PlanType=2,co2.CourseName,co.CourseName) as CourseName,
+SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,t2.BaseHoursEnabled,t2.EnableTime,if(cp.PlanType=2,'预约课',c.ClassName) as ClassName,if(cp.PlanType=2,co2.CourseName,co.CourseName) as CourseName,if(cp.PlanType=2,co2.AddHoursMoney,co.AddHoursMoney) as CourseAddHoursMoney,
 p.ClassId,if(cp.PlanType=2,s2.SName,s.SName) as SName,c.ClassType,c.ClassNo,c.ClassHourMinute,if(cp.PlanType=2,cp.CourseId,c.CouseId) as CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate,Max(p.CurrentDeductionHours) as CurrentDeductionHours FROM rb_class_check p
 INNER JOIN rb_class_time t on p.ClassTimeId = t.ClassTimeId
 inner join rb_class_plan cp on t.ClassPlanId = cp.ClassPlanId

Edu.Repository/Grade/RB_Class_PlanRepository.cs

@@ -168,7 +168,7 @@ WHERE 1=1 AND C.`Status`=0 AND C.ClassStatus<>3
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@" 
-SELECT a.*,c.Teacher_Id,if(a.PlanType=2,'预约课',c.ClassName) as ClassName,c.ClassType,c.ClassHourMinute,T.TeacherName,if(a.PlanType=2,cou2.CourseName,cou.CourseName) as CourseName
+SELECT a.*,c.Teacher_Id,if(a.PlanType=2,'预约课',c.ClassName) as ClassName,c.ClassType,c.ClassHourMinute,T.TeacherName,if(a.PlanType=2,cou2.CourseName,cou.CourseName) as CourseName,if(a.PlanType=2,cou2.AddHoursMoney,cou.AddHoursMoney) as CourseAddHoursMoney
 FROM rb_class_plan as a 
     LEFT JOIN rb_class c on a.ClassId = c.ClassId
     LEFT JOIN rb_teacher AS T ON a.TeacherId=T.TId

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -422,7 +422,8 @@ namespace Edu.WebApi.Controllers.Course
                 ScrollMinNum = base.ParmJObj.GetInt("ScrollMinNum"),
                 ScrollMaxNum = base.ParmJObj.GetInt("ScrollMaxNum"),
                 CourseTimeId = base.ParmJObj.GetInt("CourseTimeId"),
-                FreeCoffeeNum = base.ParmJObj.GetInt("FreeCoffeeNum", 0)
+                FreeCoffeeNum = base.ParmJObj.GetInt("FreeCoffeeNum", 0),
+                AddHoursMoney = base.ParmJObj.GetDecimal("AddHoursMoney")
             };
             try
             {