Commit f68d463a authored by 吴春's avatar 吴春

提交代码

parent 12e1e9ae
...@@ -878,6 +878,7 @@ namespace Mall.Module.Education ...@@ -878,6 +878,7 @@ namespace Mall.Module.Education
}; };
flag = pointTeacherCourseOrderRepository.Update(fileds, auditrecordWhereHelpers, trans); flag = pointTeacherCourseOrderRepository.Update(fileds, auditrecordWhereHelpers, trans);
if (flag)//推送房间信息 if (flag)//推送房间信息
{ {
List<string> openidList = new List<string>(); List<string> openidList = new List<string>();
...@@ -885,7 +886,7 @@ namespace Mall.Module.Education ...@@ -885,7 +886,7 @@ namespace Mall.Module.Education
new MiniProgramMsgModule().SendCourseOrderTplMsg(model.TenantId, model.MallBaseId, openidList, model.CourseName, "老师:" + model.TeacherName + "时间:" + model.StudyDate.ToString("HH:mm"), model.StudyDate.ToString("MM月dd日")); new MiniProgramMsgModule().SendCourseOrderTplMsg(model.TenantId, model.MallBaseId, openidList, model.CourseName, "老师:" + model.TeacherName + "时间:" + model.StudyDate.ToString("HH:mm"), model.StudyDate.ToString("MM月dd日"));
} }
} }
pointTeacherCourseOrderRepository.DBSession.Commit();
return flag; return flag;
} }
...@@ -999,6 +1000,8 @@ namespace Mall.Module.Education ...@@ -999,6 +1000,8 @@ namespace Mall.Module.Education
member_UserRepository.Update(filedsUser, userWhereHelpers, trans); member_UserRepository.Update(filedsUser, userWhereHelpers, trans);
} }
pointTeacherCourseOrderRepository.DBSession.Commit();
return flag; return flag;
} }
......
...@@ -422,7 +422,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -422,7 +422,7 @@ namespace Mall.WebApi.Controllers.Education
return ApiResult.Failed("预约结束时间不能大于课程预约结束时间"); return ApiResult.Failed("预约结束时间不能大于课程预约结束时间");
} }
foreach (var item in orderList) foreach (var item in orderList.Where(x => x.ID != query.ID))
{ {
DateTime endTime = item.StudyDate; DateTime endTime = item.StudyDate;
...@@ -654,12 +654,13 @@ namespace Mall.WebApi.Controllers.Education ...@@ -654,12 +654,13 @@ namespace Mall.WebApi.Controllers.Education
{ {
updateList = oldcourseOrderList.Where(x => x.OrderStaus == Common.Enum.Point.OrderStausEnum.Paid).ToList(); updateList = oldcourseOrderList.Where(x => x.OrderStaus == Common.Enum.Point.OrderStausEnum.Paid).ToList();
} }
if (updateList == null || updateList.Any()) if (updateList == null || !updateList.Any())
{ {
return ApiResult.Failed("订单已确认"); return ApiResult.Failed("订单已确认");
} }
updateList.ForEach(x => x.OrderStaus = Common.Enum.Point.OrderStausEnum.NoClass); updateList.ForEach(x => x.OrderStaus = Common.Enum.Point.OrderStausEnum.NoClass);
updateList.ForEach(x => x.UpdateDate = System.DateTime.Now); updateList.ForEach(x => x.UpdateDate = System.DateTime.Now);
updateList.ForEach(x => x.RoomInfo = query.RoomInfo);
bool result = pointModule.ConfirmTeacherCourseOrder(updateList); bool result = pointModule.ConfirmTeacherCourseOrder(updateList);
if (result) if (result)
...@@ -712,11 +713,11 @@ namespace Mall.WebApi.Controllers.Education ...@@ -712,11 +713,11 @@ namespace Mall.WebApi.Controllers.Education
bool result = pointModule.CompleteTeacherCourseOrder(oldModel); bool result = pointModule.CompleteTeacherCourseOrder(oldModel);
if (result) if (result)
{ {
return ApiResult.Success("订单确认成功"); return ApiResult.Success("订单完成操作成功");
} }
else else
{ {
return ApiResult.Failed("订单确认失败"); return ApiResult.Failed("订单完成操作失败");
} }
} }
} }
......
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