Commit 49032125 authored by 吴春's avatar 吴春

提交代码

parent 17720bf1
...@@ -959,9 +959,9 @@ namespace Mall.WebApi.Controllers.Education ...@@ -959,9 +959,9 @@ namespace Mall.WebApi.Controllers.Education
durationMinutes = Convert.ToDouble(Convert.ToDouble(item.StudyDuration)); durationMinutes = Convert.ToDouble(Convert.ToDouble(item.StudyDuration));
// item.StudyEndTime = query.StudyDate.AddMinutes(Convert.ToDouble(item.StudyDuration)); // item.StudyEndTime = query.StudyDate.AddMinutes(Convert.ToDouble(item.StudyDuration));
} }
item.StudyEndTime = item.StudyDate.AddMinutes(-durationMinutes); item.StudyEndTime = item.StudyEndTime.AddMinutes(-durationMinutes);
} }
planList.Add(new planList.Add(new
{ {
item.ID, item.ID,
...@@ -975,6 +975,8 @@ namespace Mall.WebApi.Controllers.Education ...@@ -975,6 +975,8 @@ namespace Mall.WebApi.Controllers.Education
item.StudyEndDate, item.StudyEndDate,
item.PointNum, item.PointNum,
item.CourseName, item.CourseName,
item.IsFree,
item.IsPublic,
item.ClassName, item.ClassName,
item.MinDuration, item.MinDuration,
item.StudentNumTypeName, item.StudentNumTypeName,
......
...@@ -396,11 +396,10 @@ namespace Mall.WebApi.Controllers.Education ...@@ -396,11 +396,10 @@ namespace Mall.WebApi.Controllers.Education
public ApiResult GetCompleteTeacherCourseOrder() public ApiResult GetCompleteTeacherCourseOrder()
{ {
var parms = RequestParm; var parms = RequestParm;
var userInfo = AppletUserInfo; var userInfo = UserInfo;
var query = JsonConvert.DeserializeObject<RB_Point_TeacherCourseOrder_Extend>(RequestParm.msg.ToString()); var query = JsonConvert.DeserializeObject<RB_Point_TeacherCourseOrder_Extend>(RequestParm.msg.ToString());
query.TenantId = userInfo.TenantId; query.TenantId = userInfo.TenantId;
query.MallBaseId = parms.MallBaseId; query.MallBaseId = parms.MallBaseId;
query.TeacherId = userInfo.UserTeacher;
if (query == null) if (query == null)
{ {
......
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