Commit 7edc1202 authored by 吴春's avatar 吴春

提交代码

parent 06924957
...@@ -828,7 +828,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -828,7 +828,7 @@ namespace Mall.WebApi.Controllers.Education
if (oldPointGoodsList != null && oldPointGoodsList.Any()) if (oldPointGoodsList != null && oldPointGoodsList.Any())
{ {
string courseIds = string.Join(",", oldPointGoodsList.Select(x => x.ID)); string courseIds = string.Join(",", oldPointGoodsList.Select(x => x.ID));
courseOrder = pointModule.GetPointOrderList(new RB_Point_TeacherCourseOrder_Extend { SelectOrderStatus = 1, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, CourseIds = courseIds, UserId = userInfo.UserId }); courseOrder = pointModule.GetPointOrderList(new RB_Point_TeacherCourseOrder_Extend { SelectOrderStatus = 1, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, CourseIds = courseIds });
} }
if (oldPointGoodsList != null && oldPointGoodsList.Any()) if (oldPointGoodsList != null && oldPointGoodsList.Any())
...@@ -857,7 +857,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -857,7 +857,7 @@ namespace Mall.WebApi.Controllers.Education
List<object> orderList = new List<object>(); List<object> orderList = new List<object>();
if (nowCourseOrderList != null && nowCourseOrderList.Any()) if (nowCourseOrderList != null && nowCourseOrderList.Any())
{ {
orderList.AddRange(nowCourseOrderList.Select(x => new { x.UserName, x.Photo, StartStudyDate = x.StudyDate.ToString("HH:mm"), EndStudyDate = x.DurationUnit == Common.Enum.Point.DurationUnitEnum.Hour ? (x.StudyDate.AddMinutes(Convert.ToDouble(x.TotalStudyDuration * 60))) : x.StudyDate.AddMinutes(Convert.ToDouble(x.TotalStudyDuration)) })); orderList.AddRange(nowCourseOrderList.Select(x => new { x.UserName, x.Photo, StartStudyDate = x.StudyDate.ToString("HH:mm"), EndStudyDate = (x.DurationUnit == Common.Enum.Point.DurationUnitEnum.Hour ? (x.StudyDate.AddMinutes(Convert.ToDouble(x.TotalStudyDuration * 60))) : x.StudyDate.AddMinutes(Convert.ToDouble(x.TotalStudyDuration))).ToString("HH:mm") }));
} }
planList.Add(new planList.Add(new
{ {
......
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