提成调整

Edu.Module.Course/SellCommissionModule.cs

@@ -560,7 +560,7 @@ namespace Edu.Module.Course
                     }
 
                     #region 计算课时
-                    var g3list = glist.Where(x => x.OrderId == item.OrderId && x.GuestState != 2).ToList();
+                    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调整
                     decimal TotalHours = g3list.Sum(x => x.TotalHours);// 直接根据学生表  总课时计算   (必须签到课时 = 总课时  才发完最后一个月的)
@@ -1881,7 +1881,7 @@ namespace Edu.Module.Course
                     }
 
                     #region 计算课时
-                    var g3list = glist.Where(x => x.OrderId == item.OrderId && x.GuestState != 2).ToList();
+                    var g3list = glist.Where(x => x.OrderId == item.OrderId).ToList();
                     //查询这几个学生累计课时
                     decimal TotalLearn = CheckList.Where(x => x.OrderId == item.OrderId).Sum(x => x.CurrentDeductionHours);//累计消费课时
                     decimal TotalHours = g3list.Sum(x => x.TotalHours);// 直接根据学生表  总课时计算   (必须签到课时 = 总课时  才发完最后一个月的)
@@ -2066,7 +2066,7 @@ namespace Edu.Module.Course
                         #region 班级提成
                         //查询是否订单下所有学员都已退学  
                         var g2list = glist.Where(x => x.OrderId == item.OrderId).ToList();
-                        if (g2list.Where(x => x.GuestState == 2).Count() == item.GuestNum)
+                        if (g2list.Where(x => x.GuestState == -1).Count() == item.GuestNum)
                         {
                             //所有学生都退学了   直接计算提成  全部一次性发放
                             if (item.HelpEnterId > 0)

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -313,7 +313,7 @@ group by g.Id;";
         {
             string sql = $@"SELECT g.OrderId,DATE_FORMAT(c.ClassDate,'%Y-%m') as MonthDateStr,SUM(c.CurrentDeductionHours) CurrentDeductionHours FROM rb_order_guest g
 left join rb_class_check c on g.Id = c.OrderGuestId
-WHERE g.Group_Id ={groupId} and g.`Status`=0 and g.GuestState <>2 and c.`Status` =0 and g.OrderId in({orderIds})
+WHERE g.Group_Id ={groupId} and g.`Status`=0 and c.`Status` =0 and g.OrderId in({orderIds})
 group by g.OrderId,DATE_FORMAT(c.ClassDate,'%Y-%m');";
             return Get<RB_Class_Check_ViewModel>(sql).ToList();
         }