Commit 919adfe6 authored by 黄奎's avatar 黄奎

页面修改

parent 4e1065d4
......@@ -2077,7 +2077,7 @@ namespace Edu.Module.Course
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
#region 欠费提醒(销售)
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
if (!string.IsNullOrEmpty(queryTargetWorkId)&& sellerInfo!=null )
{
// 学员名称(名称+电话),剩余课时,关联单号,待收金额,班级老师,班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
......@@ -2135,10 +2135,11 @@ namespace Edu.Module.Course
{
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.CreateBy);
#region 即将欠费提醒(销售)
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.CreateBy);
if (!string.IsNullOrEmpty(queryTargetWorkId)&& sellerInfo!=null)
{
// 学员名称(名称+电话),剩余课时,关联单号,待收金额,班级老师,班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
......@@ -2198,7 +2199,7 @@ namespace Edu.Module.Course
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
#region 即将结课提醒 (销售端)
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
if (!string.IsNullOrEmpty(queryTargetWorkId)&&sellerInfo!=null)
{
// 学员名称(名称+电话),剩余课时,关联单号,待收金额,班级老师,班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
......@@ -2261,7 +2262,7 @@ namespace Edu.Module.Course
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
#region 即将结课提醒 (销售端)
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
if (!string.IsNullOrEmpty(queryTargetWorkId)&& sellerInfo!=null)
{
// 学员名称(名称+电话),剩余课时,关联单号,待收金额,班级老师,班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
......@@ -5289,7 +5290,8 @@ namespace Edu.Module.Course
//约课
planModel = class_PlanRepository.GetToDayClassPlanForYK(stuId, courseId, groupId);
}
else {
else
{
planModel = class_PlanRepository.GetToDayClassPlan(classId, groupId);
}
if (planModel != null)
......@@ -5300,7 +5302,8 @@ namespace Edu.Module.Course
var ogModel = order_GuestRepository.GetEntity(guestId);
zj = ogModel.CourseChapterNo + 1;//这次课的章节
}
else {
else
{
zj = planModel.LessonPlanNum + 1;
}
if (planModel.ClassDate.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
......
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