页面修改

Edu.Module.Course/OrderModule2.cs

@@ -90,8 +90,7 @@ namespace Edu.Module.Course
                 backNum = totalBackCount.ToString();
             }
        
-            //基础课时分钟数
-            var BasicMinutes = class_ConfigRepository.GetClassMinutesRepository(orderModel.ClassId);
+      
             var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(GuestId.ToString());
             //完成课时数
             var FinishHours = stuCheckList?.Sum(qitem => qitem.FinishClassHours) ?? 0;

Edu.Module.Course/StudentBillModule.cs

@@ -31,8 +31,6 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Student_BackClassRepository student_BackClassRepository = new RB_Student_BackClassRepository();
 
-
-
         /// <summary>
         /// 旅客表仓储层对象
         /// </summary>
@@ -53,23 +51,16 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_SchoolRepository schoolRepository = new RB_SchoolRepository();
 
-
         /// <summary>
         /// 日志
         /// </summary>
         private readonly RB_User_ChangeLogRepository changeLogRepository = new RB_User_ChangeLogRepository();
 
-        /// <summary>
-        /// 班级基础配置表仓储层对象
-        /// </summary>
-        private readonly RB_Class_ConfigRepository class_ConfigRepository = new RB_Class_ConfigRepository();
-
         /// <summary>
         /// 学员签到仓储层对象
         /// </summary>
         private readonly RB_Class_CheckRepository class_CheckRepository = new RB_Class_CheckRepository();
 
-
         /// <summary>
         /// 学员事件记录仓储层
         /// </summary>
@@ -98,21 +89,20 @@ namespace Edu.Module.Course
         public object GetBackBillMoneyModule(int BackId)
         {
             var backModel = student_BackClassRepository.GetEntity(BackId);
-            var guestModel = order_GuestRepository.GetEntity(backModel.GuestId);
             var orderModel = orderRepository.GetEntity(backModel.OrderId);
             //班级实体类
             var classModel = classRepository.GetEntity(backModel.ClassId);
-            //基础课时分钟数
-            var BasicMinutes = class_ConfigRepository.GetClassMinutesRepository(backModel.ClassId);
             var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(backModel.GuestId.ToString());
-            //总签到上课分钟数
-            var totalFinishMinutes = stuCheckList?.Sum(qitem => qitem.FinishMinutes) ?? 0;
             //完成课时数
-            var FinishHours = Convert.ToInt32(totalFinishMinutes) / BasicMinutes;
+            var FinishHours = stuCheckList?.Sum(qitem => qitem.FinishClassHours) ?? 0;
             //课时单价
-            var classHourPrice = Math.Round(orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours, 2);
+            var classHourPrice = orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours;
+             
             //预计退款金额
-            var backMoney = (classModel.ClassHours - FinishHours) * classHourPrice;
+            decimal backMoney = 0;
+            //违约金
+            decimal breakContractPrice = (classModel.ClassHours - FinishHours) * classHourPrice * Convert.ToDecimal(0.1);
+            backMoney = (orderModel.Income + orderModel.PlatformTax) - FinishHours * classHourPrice - breakContractPrice;
             var obj = new
             {
                 orderModel.PreferPrice,