Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Course/OrderModule.cs

@@ -5257,25 +5257,18 @@ namespace Edu.Module.Course
             var omodel = orderRepository.GetEntity(gmodel.OrderId);
             if (omodel == null) { return false; }
             if (omodel.OrderType == OrderTypeEnum.CourseOrder)
-            {
-                var cmodel = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = gmodel.Group_Id, GuestId = gmodel.Id, Status = -1 }).Where(x => x.Status != 4).FirstOrDefault();
-                if (cmodel != null)
             {
                 //有合同
-                    cmodel.Income = money >= 0 ? money : 0;
-                    cmodel.Unit_Price = 0;
-                    if (cmodel.TotalClassHours > 0)
-                    {
-                        if (cmodel.TotalDiscountMoney > 0)
-                        {
-                            cmodel.Unit_Price = Math.Round((cmodel.TotalCourseFee - (cmodel.TotalDiscountMoney / cmodel.TotalSub) * cmodel.TotalCourseFee) / cmodel.TotalClassHours, 6, MidpointRounding.AwayFromZero);//根据合同计算
-                        }
-                        else
+                omodel.Income = money >= 0 ? money : 0;
+                omodel.Income -= (omodel.CoursewareFee + omodel.TextbookFee);
+                if (omodel.Income < 0) { omodel.Income = 0; }
+
+                omodel.Unit_Price = 0;
+                if (gmodel.TotalHours > 0)
                 {
-                            cmodel.Unit_Price = Math.Round(cmodel.TotalCourseFee / cmodel.TotalClassHours, 6, MidpointRounding.AwayFromZero);//根据合同计算
-                        }
+                    omodel.Unit_Price = Math.Round((omodel.PreferPrice - omodel.DiscountMoney - omodel.CoursewareFee - omodel.TextbookFee) / gmodel.TotalHours, 6, MidpointRounding.AwayFromZero);//根据合同计算
                 }
-                    decimal validClassHours = cmodel.Unit_Price > 0 ? Math.Round(cmodel.Income / cmodel.Unit_Price, 2, MidpointRounding.AwayFromZero) : 0;
+                decimal validClassHours = omodel.Unit_Price > 0 ? Math.Round(omodel.Income / omodel.Unit_Price, 2, MidpointRounding.AwayFromZero) : 0;
 
                 Dictionary<string, object> keyValues = new Dictionary<string, object>()
                 {
@@ -5314,7 +5307,7 @@ namespace Edu.Module.Course
                     };
                 order_GuestRepository.Update(keyValues, wheres);
             }
-            }
+            
             //培训/留学订单  直接验证 订单的应收 大于等于实收             
             if (omodel.PreferPrice - omodel.DiscountMoney == money && money > 0)
             {

Edu.Module.Course/TeachingRewardsModule.cs

@@ -552,6 +552,9 @@ namespace Edu.Module.Course
             string StartTime = dmodel.Month + "-01";
             string EndTime = Convert.ToDateTime(dmodel.Month + "-01").AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd");
             var plist = class_PlanRepository.GetClassPlanList_V2(new RB_Class_Plan_ViewModel() { Group_Id = userInfo.Group_Id, Q_TeacherIds = dmodel.TeacherIds, StartTime = StartTime, EndTime = EndTime });
+            #region 排除  老师是管理员的数据
+            plist = plist.Where(x => x.TeacherId != 41).ToList();//ID 41=管理员
+            #endregion
             //查询所有课程的上课时间
             List<RB_Class_Type_ViewModel> typeList = new List<RB_Class_Type_ViewModel>();
             List<RB_Class_Check_ViewModel> checkList = new List<RB_Class_Check_ViewModel>();