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 ...@@ -614,27 +614,30 @@ namespace Edu.Module.Course
if (stlist.Any()) { if (stlist.Any()) {
//每次试听课 算一个课时 //每次试听课 算一个课时
foreach (var item in stlist) { foreach (var item in stlist) {
stDateList.Add(new RB_Teaching_BonusDetail_ViewModel() if (item.ClassHourFee > 0)
{ {
BonusId = bonusId, stDateList.Add(new RB_Teaching_BonusDetail_ViewModel()
CheckInNum = item.CheckNum, {
ClassId = item.ReserveClassId, BonusId = bonusId,
CourseHour = 1, CheckInNum = item.CheckNum,
CreateBy = dmodel.CreateBy, ClassId = item.ReserveClassId,
CreateTime = DateTime.Now, CourseHour = 1,
Date = item.ClassDate, CreateBy = dmodel.CreateBy,
Group_Id = dmodel.Group_Id, CreateTime = DateTime.Now,
Id = 0, Date = item.ClassDate,
Money = item.ClassHourFee, Group_Id = dmodel.Group_Id,
School_Id = item.School_Id, Id = 0,
Status = 0, Money = item.ClassHourFee,
TeacherId = item.TeacherId, School_Id = item.School_Id,
Type = 1, Status = 0,
UnitPrice = item.ClassHourFee, TeacherId = item.TeacherId,
UpdateBy = dmodel.UpdateBy, Type = 1,
UpdateTime = DateTime.Now, UnitPrice = item.ClassHourFee,
CouseClassify = 2 UpdateBy = dmodel.UpdateBy,
}); UpdateTime = DateTime.Now,
CouseClassify = 2
});
}
} }
} }
......
Edu.Module.Finance/FinanceModule.cs
View file @ 30c19983
...@@ -3194,23 +3194,26 @@ namespace Edu.Module.Finance ...@@ -3194,23 +3194,26 @@ namespace Edu.Module.Finance
decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数 decimal ClassHourMinute = configModel.BasicMinutes;//课时分钟数
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时 decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist) { foreach (var item in rclist) {
DateList.Add(new RB_Teaching_BonusDetail_ViewModel if (item.ClassHourFee > 0)
{ {
Date = item.ClassDate, DateList.Add(new RB_Teaching_BonusDetail_ViewModel
TimeBucket = item.ClassTime + "~" + item.EndTime, {
TeacherId = item.TeacherId, Date = item.ClassDate,
TeacherName = item.TeacherName, TimeBucket = item.ClassTime + "~" + item.EndTime,
ClassId = item.ReserveClassId, TeacherId = item.TeacherId,
ClassName = "试听课", TeacherName = item.TeacherName,
CouseId = item.TrialLessonId, ClassId = item.ReserveClassId,
CourseName = item.LessonName, ClassName = "试听课",
KSNum = 1, CouseId = item.TrialLessonId,
Hours = Hours, CourseName = item.LessonName,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero), KSNum = 1,
UnitPrice = item.ClassHourFee, Hours = Hours,
Money = item.ClassHourFee, HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
CouseClassify = 2 UnitPrice = item.ClassHourFee,
}); Money = item.ClassHourFee,
CouseClassify = 2
});
}
} }
} }
...@@ -3373,23 +3376,26 @@ namespace Edu.Module.Finance ...@@ -3373,23 +3376,26 @@ namespace Edu.Module.Finance
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时 decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist) foreach (var item in rclist)
{ {
DateList.Add(new RB_Teaching_BonusDetail_ViewModel if (item.ClassHourFee > 0)
{ {
Date = item.ClassDate, DateList.Add(new RB_Teaching_BonusDetail_ViewModel
TimeBucket = item.ClassTime + "~" + item.EndTime, {
TeacherId = item.TeacherId, Date = item.ClassDate,
TeacherName = item.TeacherName, TimeBucket = item.ClassTime + "~" + item.EndTime,
ClassId = item.ReserveClassId, TeacherId = item.TeacherId,
ClassName = "试听课", TeacherName = item.TeacherName,
CouseId = item.TrialLessonId, ClassId = item.ReserveClassId,
CourseName = item.LessonName, ClassName = "试听课",
KSNum = 1, CouseId = item.TrialLessonId,
Hours = Hours, CourseName = item.LessonName,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero), KSNum = 1,
UnitPrice = item.ClassHourFee, Hours = Hours,
Money = item.ClassHourFee, HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
CouseClassify = 2 UnitPrice = item.ClassHourFee,
}); Money = item.ClassHourFee,
CouseClassify = 2
});
}
} }
} }
...@@ -3588,27 +3594,30 @@ namespace Edu.Module.Finance ...@@ -3588,27 +3594,30 @@ namespace Edu.Module.Finance
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时 decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist) foreach (var item in rclist)
{ {
RList.Add(new RB_Teaching_BonusDetail_ViewModel if (item.ClassHourFee > 0)
{ {
Date = item.ClassDate, RList.Add(new RB_Teaching_BonusDetail_ViewModel
TimeBucket = item.ClassTime + "~" + item.EndTime, {
TeacherId = item.TeacherId, Date = item.ClassDate,
TeacherName = item.TeacherName, TimeBucket = item.ClassTime + "~" + item.EndTime,
ClassId = item.ReserveClassId, TeacherId = item.TeacherId,
ClassName = "试听课", TeacherName = item.TeacherName,
CouseId = item.TrialLessonId, ClassId = item.ReserveClassId,
CourseName = item.LessonName, ClassName = "试听课",
KSNum = 1, CouseId = item.TrialLessonId,
Hours = Hours, CourseName = item.LessonName,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero), KSNum = 1,
UnitPrice = item.ClassHourFee, Hours = Hours,
Money = item.ClassHourFee, HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
CouseClassify = 2, UnitPrice = item.ClassHourFee,
BaseHoursEnabled = item.BaseHoursEnabled, Money = item.ClassHourFee,
EnableTime = item.EnableTime, CouseClassify = 2,
BaseHoursAdd = item.BaseHoursAdd, BaseHoursEnabled = item.BaseHoursEnabled,
SName = item.SName EnableTime = item.EnableTime,
}); BaseHoursAdd = item.BaseHoursAdd,
SName = item.SName
});
}
} }
} }
...@@ -3741,27 +3750,30 @@ namespace Edu.Module.Finance ...@@ -3741,27 +3750,30 @@ namespace Edu.Module.Finance
decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时 decimal Hours = Math.Round(1 * ClassHourMinute / 60, 2, MidpointRounding.AwayFromZero);//小时
foreach (var item in rclist) foreach (var item in rclist)
{ {
RList.Add(new RB_Teaching_BonusDetail_ViewModel if (item.ClassHourFee > 0)
{ {
Date = item.ClassDate, RList.Add(new RB_Teaching_BonusDetail_ViewModel
TimeBucket = item.ClassTime + "~" + item.EndTime, {
TeacherId = item.TeacherId, Date = item.ClassDate,
TeacherName = item.TeacherName, TimeBucket = item.ClassTime + "~" + item.EndTime,
ClassId = item.ReserveClassId, TeacherId = item.TeacherId,
ClassName = "试听课", TeacherName = item.TeacherName,
CouseId = item.TrialLessonId, ClassId = item.ReserveClassId,
CourseName = item.LessonName, ClassName = "试听课",
KSNum = 1, CouseId = item.TrialLessonId,
Hours = Hours, CourseName = item.LessonName,
HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero), KSNum = 1,
UnitPrice = item.ClassHourFee, Hours = Hours,
Money = item.ClassHourFee, HourMoney = Math.Round(item.ClassHourFee / Hours, 2, MidpointRounding.AwayFromZero),
CouseClassify = 2, UnitPrice = item.ClassHourFee,
BaseHoursEnabled = item.BaseHoursEnabled, Money = item.ClassHourFee,
EnableTime = item.EnableTime, CouseClassify = 2,
BaseHoursAdd = item.BaseHoursAdd, BaseHoursEnabled = item.BaseHoursEnabled,
SName = item.SName 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