1

Edu.Module.Course/SellCommissionModule.cs

@@ -462,7 +462,7 @@ namespace Edu.Module.Course
             var courseList = courseRepository.GetCourseListRepository(new RB_Course_ViewModel() { Group_Id = userInfo.Group_Id, CourseName = "内部班" });
             string courseIds = string.Join(",", courseList.Select(x => x.CourseId));
 
-            courseIds += ",16";//增加 领队日语 （不参与提成）
+            courseIds += ",16,215,285";//增加 领队日语 （不参与提成）
             #endregion
 
             string EnableDate = Config.NewAchievementsEnable;//新提成启用时间
@@ -480,7 +480,7 @@ namespace Edu.Module.Course
                 var UserList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { Group_Id = userInfo.Group_Id, QIds = userIds });
                 //查询班级信息
                 string classIds = string.Join(",", orderList.Select(x => x.ClassId).Distinct());
-                var clist = classRepository.GetClassListRepository(new RB_Class_ViewModel() { Group_Id = userInfo.Group_Id, Q_ClassIds = classIds });
+                var clist = classRepository.GetClassListRepository(new RB_Class_ViewModel() { Group_Id = userInfo.Group_Id, Q_ClassIds = classIds, ClassScrollType = 0 });
                 //查询订单下所有学生 已完成课时
                 string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
                 var CheckList = class_CheckRepository.GetClassStudentHoursListForOrderMonth(userInfo.Group_Id, orderIds);//使用月份统计的  方便下面每月消费课时计算
@@ -572,6 +572,7 @@ namespace Edu.Module.Course
                     var g3list = glist.Where(x => x.OrderId == item.OrderId).ToList();
                     //查询这几个学生累计课时
                     decimal TotalLearn = CheckList.Where(x => x.OrderId == item.OrderId && x.MonthDate <= Convert.ToDateTime(EDate)).Sum(x => x.CurrentDeductionHours);//累计消费课时  (要查询当前发放提成日期) ld 07-02调整
+                    if (TotalLearn <= 0) { continue; }
                     decimal TotalHours = g3list.Sum(x => x.TotalHours);// 直接根据学生表  总课时计算   (必须签到课时 = 总课时  才发完最后一个月的)
 
                     TotalLearn = TotalHours; // 2022 -03-31 次月全额发放提成 ld；