1

Edu.Module.Finance/FinanceModule.cs

@@ -149,11 +149,7 @@ namespace Edu.Module.Finance
         /// <summary>
         /// 收据
         /// </summary>
-        private readonly RB_Receipt_InfoRepository receipt_InfoRepository = new RB_Receipt_InfoRepository();
-        /// <summary>
-        /// 试听课程
-        /// </summary>
-        private readonly RB_TrialLessonRepository trialLessonRepository = new RB_TrialLessonRepository();
+        private readonly RB_Receipt_InfoRepository receipt_InfoRepository = new RB_Receipt_InfoRepository();        
         /// <summary>
         /// 试听班级
         /// </summary>
@@ -4812,6 +4808,18 @@ namespace Edu.Module.Finance
 
             return RList;
         }
+
+
+        /// <summary>
+        /// 获取试听班级月度老师课时费
+        /// </summary>
+        /// <param name="reserveClassId"></param>
+        /// <returns></returns>
+        public RB_Teaching_BonusDetail_ViewModel GetReserveClassHours(int reserveClassId,int groupId)
+        {
+            return teaching_BonusDetailRepository.GetReserveClassHours(reserveClassId, groupId);
+        }
+
         #endregion
 
         #region 收据管理

Edu.Repository/Sell/RB_Teaching_BonusDetailRepository.cs

@@ -52,6 +52,11 @@ namespace Edu.Repository.Sell
             {
                 where += $@" and  A.{nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}";
             }
+            if (demodel.CouseClassify > 0)
+            {
+                where += $@" and  A.{nameof(RB_Teaching_BonusDetail.CouseClassify)} ={demodel.CouseClassify}";
+            }
+
             string sql = $@" select A.* from RB_Teaching_BonusDetail   as A  LEFT JOIN rb_teaching_bonus as b on a.BonusId=b.Id  and b.State=2 where {where} order by a.Id desc";
             return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList();
         }
@@ -380,5 +385,20 @@ WHERE p.Group_Id ={group_Id} {where} and STR_TO_DATE(CONCAT(p.`Month`,'-01'),'%Y
 GROUP BY d.ClassId";
             return Get<RB_Teaching_BonusDetail_ViewModel>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取试听课老师课时费
+        /// </summary>
+        /// <param name="reserveClassId"></param>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public RB_Teaching_BonusDetail_ViewModel GetReserveClassHours(int reserveClassId, int groupId)
+        {
+            string sql = $@"select Sum(d.CourseHour) as CourseHour,Sum(d.DeductionHour) as DeductionHour,Sum(d.Money) as Money 
+from rb_teaching_bonusdetail d
+left join rb_teaching_bonus b on b.Id = d.BonusId
+where d.Status =0 and b.State =2 and d.Group_Id ={groupId} and d.ClassId ={reserveClassId} and d.CouseClassify =2";
+            return Get<RB_Teaching_BonusDetail_ViewModel>(sql).FirstOrDefault();
+        }
     }
 }

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -172,7 +172,7 @@ namespace Edu.WebApi.Controllers.Finance
             if (classId > 0)
             {
                 //课时费  老师绩效
-                var teacherProfitList = teachingRewardsModule.GetBonusDetailList(new RB_Teaching_BonusDetail_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId });
+                var teacherProfitList = teachingRewardsModule.GetBonusDetailList(new RB_Teaching_BonusDetail_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId, CouseClassify = 1 });
                 TeacherProfitNow = (teacherProfitList != null && teacherProfitList.Any()) ? teacherProfitList.Sum(x => x.Money) : 0;//老师提成
 
                 var meritsProfitList = teachingRewardsModule.GetTeachingPerfList(new RB_Teaching_Perf_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId });
@@ -297,7 +297,7 @@ namespace Edu.WebApi.Controllers.Finance
 
             //提成
             decimal SaleCommission = (orderList != null && orderList.Any()) ? orderList.Where(x => x.IsCommissionGive == 1).Sum(x => x.CommissionMoney) : 0; ;//销售提成
-            var teacherProfitList = teachingRewardsModule.GetBonusDetailList(new RB_Teaching_BonusDetail_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId });
+            var teacherProfitList = teachingRewardsModule.GetBonusDetailList(new RB_Teaching_BonusDetail_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId, CouseClassify = 1 });
             decimal TeacherProfitNow = (teacherProfitList != null && teacherProfitList.Any()) ? teacherProfitList.Sum(x => x.Money) : 0;//老师提成
 
             var meritsProfitList = teachingRewardsModule.GetTeachingPerfList(new RB_Teaching_Perf_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId });
@@ -594,6 +594,9 @@ namespace Edu.WebApi.Controllers.Finance
             PayReceive = (financeList != null && financeList.Any()) ? financeList.Where(x => x.Type == WFTempLateClassEnum.OUT).Sum(x => x.Money ?? 0) : 0;
             PayActual = (financeList != null && financeList.Any()) ? financeList.Where(x => x.Type == WFTempLateClassEnum.OUT).Sum(x => x.PayMoney ?? 0) : 0;
 
+            //查询月结老师的课时费
+            var monthModel = financeModule.GetReserveClassHours(ReserveClassId, base.UserInfo.Group_Id);
+            
             var recultFiniceList = financeList.Select(x => new
             {
                 x.FrID,
@@ -626,6 +629,9 @@ namespace Edu.WebApi.Controllers.Finance
                 PayActual,
                 incomeList = recultFiniceList.Where(t => t.Type == WFTempLateClassEnum.IN),//其他收入
                 outList = recultFiniceList.Where(t => t.Type == WFTempLateClassEnum.OUT),//其他支出
+                monthModel.CourseHour,
+                monthModel.DeductionHour,
+                MonthHoursMoney = monthModel.Money,
             };
             return ApiResult.Success(data: obj);
         }