Skip to content

E
Education
Commit 30c19983 authored by liudong1993's avatar liudong1993
Browse files
Options

1 甲鹤试听课调整

parent a8994290
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 92 deletions
Edu.Module.Course/TeachingRewardsModule.cs
View file @ 30c19983
......@@ -614,27 +614,30 @@ namespace Edu.Module.Course
if (stlist.Any()) {
//每次试听课 算一个课时
foreach (var item in stlist) {
stDateList.Add(new RB_Teaching_BonusDetail_ViewModel()
if (item.ClassHourFee > 0)
{
BonusId = bonusId,
CheckInNum = item.CheckNum,
ClassId = item.ReserveClassId,
CourseHour = 1,
CreateBy = dmodel.CreateBy,
CreateTime = DateTime.Now,
Date = item.ClassDate,
Group_Id = dmodel.Group_Id,
Id = 0,
Money = item.ClassHourFee,
School_Id = item.School_Id,
Status = 0,
TeacherId = item.TeacherId,
Type = 1,
UnitPrice = item.ClassHourFee,
UpdateBy = dmodel.UpdateBy,
UpdateTime = DateTime.Now,
CouseClassify = 2
});
stDateList.Add(new RB_Teaching_BonusDetail_ViewModel()
{
BonusId = bonusId,
CheckInNum = item.CheckNum,
ClassId = item.ReserveClassId,
CourseHour = 1,
CreateBy = dmodel.CreateBy,
CreateTime = DateTime.Now,
Date = item.ClassDate,
Group_Id = dmodel.Group_Id,
Id = 0,
Money = item.ClassHourFee,
School_Id = item.School_Id,
Status = 0,
TeacherId = item.TeacherId,
Type = 1,
UnitPrice = item.ClassHourFee,
UpdateBy = dmodel.UpdateBy,
UpdateTime = DateTime.Now,
CouseClassify = 2
});
}
}
}
......
Edu.Module.Finance/FinanceModule.cs
View file @ 30c19983
......@@ -3194,23 +3194,26 @@ namespace Edu.Module.Finance
decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist) {
DateList.Add(new RB_Teaching_BonusDetail_ViewModel
if (item.ClassHourFee > 0)
{
Date = item.ClassDate,
TimeBucket = item.ClassTime + "~" + item.EndTime,
TeacherId = item.TeacherId,
TeacherName = item.TeacherName,
ClassId = item.ReserveClassId,
ClassName = "试听课",
CouseId = item.TrialLessonId,
CourseName = item.LessonName,
KSNum = 1,
Hours = Hours,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
UnitPrice = item.ClassHourFee,
Money = item.ClassHourFee,
CouseClassify = 2
});
DateList.Add(new RB_Teaching_BonusDetail_ViewModel
{
Date = item.ClassDate,
TimeBucket = item.ClassTime + "~" + item.EndTime,
TeacherId = item.TeacherId,
TeacherName = item.TeacherName,
ClassId = item.ReserveClassId,
ClassName = "试听课",
CouseId = item.TrialLessonId,
CourseName = item.LessonName,
KSNum = 1,
Hours = Hours,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
UnitPrice = item.ClassHourFee,
Money = item.ClassHourFee,
CouseClassify = 2
});
}
}
}
......@@ -3373,23 +3376,26 @@ namespace Edu.Module.Finance
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist)
{
DateList.Add(new RB_Teaching_BonusDetail_ViewModel
if (item.ClassHourFee > 0)
{
Date = item.ClassDate,
TimeBucket = item.ClassTime + "~" + item.EndTime,
TeacherId = item.TeacherId,
TeacherName = item.TeacherName,
ClassId = item.ReserveClassId,
ClassName = "试听课",
CouseId = item.TrialLessonId,
CourseName = item.LessonName,
KSNum = 1,
Hours = Hours,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
UnitPrice = item.ClassHourFee,
Money = item.ClassHourFee,
CouseClassify = 2
});
DateList.Add(new RB_Teaching_BonusDetail_ViewModel
{
Date = item.ClassDate,
TimeBucket = item.ClassTime + "~" + item.EndTime,
TeacherId = item.TeacherId,
TeacherName = item.TeacherName,
ClassId = item.ReserveClassId,
ClassName = "试听课",
CouseId = item.TrialLessonId,
CourseName = item.LessonName,
KSNum = 1,
Hours = Hours,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
UnitPrice = item.ClassHourFee,
Money = item.ClassHourFee,
CouseClassify = 2
});
}
}
}
......@@ -3588,27 +3594,30 @@ namespace Edu.Module.Finance
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist)
{
RList.Add(new RB_Teaching_BonusDetail_ViewModel
if (item.ClassHourFee > 0)
{
Date = item.ClassDate,
TimeBucket = item.ClassTime + "~" + item.EndTime,
TeacherId = item.TeacherId,
TeacherName = item.TeacherName,
ClassId = item.ReserveClassId,
ClassName = "试听课",
CouseId = item.TrialLessonId,
CourseName = item.LessonName,
KSNum = 1,
Hours = Hours,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
UnitPrice = item.ClassHourFee,
Money = item.ClassHourFee,
CouseClassify = 2,
BaseHoursEnabled = item.BaseHoursEnabled,
EnableTime = item.EnableTime,
BaseHoursAdd = item.BaseHoursAdd,
SName = item.SName
});
RList.Add(new RB_Teaching_BonusDetail_ViewModel
{
Date = item.ClassDate,
TimeBucket = item.ClassTime + "~" + item.EndTime,
TeacherId = item.TeacherId,
TeacherName = item.TeacherName,
ClassId = item.ReserveClassId,
ClassName = "试听课",
CouseId = item.TrialLessonId,
CourseName = item.LessonName,
KSNum = 1,
Hours = Hours,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
UnitPrice = item.ClassHourFee,
Money = item.ClassHourFee,
CouseClassify = 2,
BaseHoursEnabled = item.BaseHoursEnabled,
EnableTime = item.EnableTime,
BaseHoursAdd = item.BaseHoursAdd,
SName = item.SName
});
}
}
}
......@@ -3741,27 +3750,30 @@ namespace Edu.Module.Finance
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist)
{
RList.Add(new RB_Teaching_BonusDetail_ViewModel
if (item.ClassHourFee > 0)
{
Date = item.ClassDate,
TimeBucket = item.ClassTime + "~" + item.EndTime,
TeacherId = item.TeacherId,
TeacherName = item.TeacherName,
ClassId = item.ReserveClassId,
ClassName = "试听课",
CouseId = item.TrialLessonId,
CourseName = item.LessonName,
KSNum = 1,
Hours = Hours,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
UnitPrice = item.ClassHourFee,
Money = item.ClassHourFee,
CouseClassify = 2,
BaseHoursEnabled = item.BaseHoursEnabled,
EnableTime = item.EnableTime,
BaseHoursAdd = item.BaseHoursAdd,
SName = item.SName
});
RList.Add(new RB_Teaching_BonusDetail_ViewModel
{
Date = item.ClassDate,
TimeBucket = item.ClassTime + "~" + item.EndTime,
TeacherId = item.TeacherId,
TeacherName = item.TeacherName,
ClassId = item.ReserveClassId,
ClassName = "试听课",
CouseId = item.TrialLessonId,
CourseName = item.LessonName,
KSNum = 1,
Hours = Hours,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
UnitPrice = item.ClassHourFee,
Money = item.ClassHourFee,
CouseClassify = 2,
BaseHoursEnabled = item.BaseHoursEnabled,
EnableTime = item.EnableTime,
BaseHoursAdd = item.BaseHoursAdd,
SName = item.SName
});
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment