页面修改

Edu.Module.Course/ClassModule.cs

@@ -1321,6 +1321,11 @@ namespace Edu.Module.Course
                         CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
                         item.Mobile,
                         item.OrderId,
+                        item.TotalHours,
+                        item.CompleteHours,
+                        item.ValidClassHours,
+                        SurplusHours=item.TotalHours-item.CompleteHours,
+                        item.MakeUpHours,
                         ClassHours = item.CompleteHours + "-" + (classModel?.ClassHours ?? 0),
                         IsRenew = item.IsRenewOrder,
                         item.RenewOrderId,

Edu.Module.Course/OrderModule2.cs

@@ -93,13 +93,11 @@ namespace Edu.Module.Course
             //基础课时分钟数
             var BasicMinutes = class_ConfigRepository.GetClassMinutesRepository(orderModel.ClassId);
             var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(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;
             //预计退款金额
             decimal backMoney =0;
             //backMoney = (classModel.ClassHours - FinishHours) * classHourPrice;
@@ -116,7 +114,7 @@ namespace Edu.Module.Course
                 ClassId = orderModel.ClassId,
                 CreateBy = userinfo.Id,
                 CreateTime = DateTime.Now,
-                FinishHours = FinishHours,
+                FinishHours = Convert.ToInt32(FinishHours),
                 Group_Id = userinfo.Group_Id,
                 GuestId = GuestId,
                 SchoolId = guestModel.School_Id,

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -726,7 +726,7 @@ namespace Edu.WebApi.Controllers.Course
             var classId = base.ParmJObj.GetInt("ClassId");
             var schoolId = 0;
             int QEffectStatus = base.ParmJObj.GetInt("QEffectStatus");
-            //var schoolId = base.ParmJObj.GetInt("School_Id");
+ 
             var data = classModule.GetClassStudentListModule(classId, schoolId, base.UserInfo.Group_Id, 0, QEffectStatus: QEffectStatus);
             return ApiResult.Success(data: data);
         }