Commit 61c26b3c authored by liudong1993's avatar liudong1993

1

parent b0cc020a
...@@ -2022,6 +2022,7 @@ namespace Edu.Module.Course ...@@ -2022,6 +2022,7 @@ namespace Edu.Module.Course
{nameof(RB_Order_Guest_ViewModel.CompleteHours),completeHours } {nameof(RB_Order_Guest_ViewModel.CompleteHours),completeHours }
}; };
var orderModel = orderRepository.GetEntity(guestModel.OrderId);
string LogContent = ""; string LogContent = "";
var shenyuHours = guestModel.ValidClassHours - completeHours; var shenyuHours = guestModel.ValidClassHours - completeHours;
//已上课时>=有效课时,如果是,修改学员状态为停课,并且备注“有效课时消耗完毕,系统自动停课” //已上课时>=有效课时,如果是,修改学员状态为停课,并且备注“有效课时消耗完毕,系统自动停课”
...@@ -2031,8 +2032,7 @@ namespace Edu.Module.Course ...@@ -2031,8 +2032,7 @@ namespace Edu.Module.Course
orderFileds.Add(nameof(RB_Order_Guest_ViewModel.ChangeEffectTime), System.DateTime.Now); orderFileds.Add(nameof(RB_Order_Guest_ViewModel.ChangeEffectTime), System.DateTime.Now);
orderFileds.Add(nameof(RB_Order_Guest_ViewModel.DropOutRemark), "有效课时消耗完毕,系统自动停课"); orderFileds.Add(nameof(RB_Order_Guest_ViewModel.DropOutRemark), "有效课时消耗完毕,系统自动停课");
LogContent = guestModel.GuestName + "有效课时消耗完毕,系统自动停课!"; LogContent = guestModel.GuestName + "有效课时消耗完毕,系统自动停课!";
var orderModel = orderRepository.GetEntity(guestModel.OrderId);
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice; var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId); var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID); var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
...@@ -2094,7 +2094,6 @@ namespace Edu.Module.Course ...@@ -2094,7 +2094,6 @@ namespace Edu.Module.Course
} }
else if (guestModel.TotalHours > guestModel.ValidClassHours && shenyuHours < 12) else if (guestModel.TotalHours > guestModel.ValidClassHours && shenyuHours < 12)
{ {
var orderModel = orderRepository.GetEntity(guestModel.OrderId);
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice; var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId); var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID); var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
...@@ -2155,7 +2154,6 @@ namespace Edu.Module.Course ...@@ -2155,7 +2154,6 @@ namespace Edu.Module.Course
} }
else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours < 12 && shenyuHours > 0) else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours < 12 && shenyuHours > 0)
{ {
var orderModel = orderRepository.GetEntity(guestModel.OrderId);
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice; var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId); var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID); var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
...@@ -2219,7 +2217,6 @@ namespace Edu.Module.Course ...@@ -2219,7 +2217,6 @@ namespace Edu.Module.Course
} }
else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours == 0) else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours == 0)
{ {
var orderModel = orderRepository.GetEntity(guestModel.OrderId);
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice; var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId); var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID); var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
...@@ -2343,82 +2340,85 @@ namespace Edu.Module.Course ...@@ -2343,82 +2340,85 @@ namespace Edu.Module.Course
} }
#region B2B同业推送 #region B2B同业推送
//最后5个课时做处理 if (orderModel != null && orderModel.CustomerId > 0)
if (completeHours > guestModel.ValidClassHours)
{ {
//已停课 //最后5个课时做处理
b2B_StudentNoticeRepository.Insert(new Model.Entity.Log.RB_B2B_StudentNotice() if (completeHours > guestModel.ValidClassHours)
{ {
Id = 0, //已停课
Type = 3, b2B_StudentNoticeRepository.Insert(new Model.Entity.Log.RB_B2B_StudentNotice()
StudentId = guestModel.Id, {
CustomerId = 1, Id = 0,
Title = "停课通知", Type = 3,
Content = "学员" + guestModel.GuestName + " 有效课时消耗完毕,已自动停课,关联单号:" + guestModel.OrderId + "!", StudentId = guestModel.Id,
IsLook = 2, CustomerId = orderModel.CustomerId,
Status = 0, Title = "停课通知",
CreateBy = item.CreateBy, Content = "学员" + guestModel.GuestName + " 有效课时消耗完毕,已自动停课,关联单号:" + guestModel.OrderId + "!",
CreateTime = DateTime.Now, IsLook = 2,
Group_Id = item.Group_Id, Status = 0,
UpdateTime = DateTime.Now CreateBy = item.CreateBy,
}); CreateTime = DateTime.Now,
} Group_Id = item.Group_Id,
else if (guestModel.TotalHours > guestModel.ValidClassHours && shenyuHours <= 5) UpdateTime = DateTime.Now
{ });
//即将欠费 }
b2B_StudentNoticeRepository.Insert(new Model.Entity.Log.RB_B2B_StudentNotice() else if (guestModel.TotalHours > guestModel.ValidClassHours && shenyuHours <= 5)
{ {
Id = 0, //即将欠费
Type = 1, b2B_StudentNoticeRepository.Insert(new Model.Entity.Log.RB_B2B_StudentNotice()
StudentId = guestModel.Id, {
CustomerId = 1, Id = 0,
Title = "欠费预警", Type = 1,
Content = "学员" + guestModel.GuestName + " 即将欠费,剩余课时" + shenyuHours + ",关联单号:" + guestModel.OrderId + "!", StudentId = guestModel.Id,
IsLook = 2, CustomerId = orderModel.CustomerId,
Status = 0, Title = "欠费预警",
CreateBy = item.CreateBy, Content = "学员" + guestModel.GuestName + " 即将欠费,剩余课时" + shenyuHours + ",关联单号:" + guestModel.OrderId + "!",
CreateTime = DateTime.Now, IsLook = 2,
Group_Id = item.Group_Id, Status = 0,
UpdateTime = DateTime.Now CreateBy = item.CreateBy,
}); CreateTime = DateTime.Now,
} Group_Id = item.Group_Id,
else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours <= 5 && shenyuHours >= 0) UpdateTime = DateTime.Now
{ });
//即将结课 }
b2B_StudentNoticeRepository.Insert(new Model.Entity.Log.RB_B2B_StudentNotice() else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours <= 5 && shenyuHours >= 0)
{ {
Id = 0, //即将结课
Type = 2, b2B_StudentNoticeRepository.Insert(new Model.Entity.Log.RB_B2B_StudentNotice()
StudentId = guestModel.Id, {
CustomerId = 1, Id = 0,
Title = "结课预警", Type = 2,
Content = "学员" + guestModel.GuestName + " 即将结课,剩余课时" + shenyuHours + ",关联单号:" + guestModel.OrderId + "!", StudentId = guestModel.Id,
IsLook = 2, CustomerId = orderModel.CustomerId,
Status = 0, Title = "结课预警",
CreateBy = item.CreateBy, Content = "学员" + guestModel.GuestName + " 即将结课,剩余课时" + shenyuHours + ",关联单号:" + guestModel.OrderId + "!",
CreateTime = DateTime.Now, IsLook = 2,
Group_Id = item.Group_Id, Status = 0,
UpdateTime = DateTime.Now CreateBy = item.CreateBy,
}); CreateTime = DateTime.Now,
} Group_Id = item.Group_Id,
else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours == 0) UpdateTime = DateTime.Now
{ });
//已经结课 }
b2B_StudentNoticeRepository.Insert(new Model.Entity.Log.RB_B2B_StudentNotice() else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours == 0)
{ {
Id = 0, //已经结课
Type = 4, b2B_StudentNoticeRepository.Insert(new Model.Entity.Log.RB_B2B_StudentNotice()
StudentId = guestModel.Id, {
CustomerId = 1, Id = 0,
Title = "结课通知", Type = 4,
Content = "学员" + guestModel.GuestName + " 已结课,关联单号:" + guestModel.OrderId + "!", StudentId = guestModel.Id,
IsLook = 2, CustomerId = orderModel.CustomerId,
Status = 0, Title = "结课通知",
CreateBy = item.CreateBy, Content = "学员" + guestModel.GuestName + " 已结课,关联单号:" + guestModel.OrderId + "!",
CreateTime = DateTime.Now, IsLook = 2,
Group_Id = item.Group_Id, Status = 0,
UpdateTime = DateTime.Now CreateBy = item.CreateBy,
}); CreateTime = DateTime.Now,
Group_Id = item.Group_Id,
UpdateTime = DateTime.Now
});
}
} }
#endregion #endregion
} }
......
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