Skip to content

E
Education
Commit 3f3b51e4 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 9b1f6c23 a9c6a237
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 0 deletions
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 3f3b51e4
...@@ -230,6 +230,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -230,6 +230,10 @@ namespace Edu.WebApi.Controllers.Course
OrderSourceName = x.OrderSource.ToName(), OrderSourceName = x.OrderSource.ToName(),
x.EnterID, x.EnterID,
EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "", EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "",
x.CreateBy,
CreateByName = UserReidsCache.GetUserLoginInfo(x.CreateBy)?.AccountName ?? "",
x.CourseConsultantId,
ConsultantName = UserReidsCache.GetUserLoginInfo(x.CourseConsultantId)?.AccountName ?? "",
YFCommissionMoney = GetOrderYFCommission(x), YFCommissionMoney = GetOrderYFCommission(x),
x.CommissionMoney, x.CommissionMoney,
x.ExtraCommissionMoney, x.ExtraCommissionMoney,
...@@ -346,6 +350,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -346,6 +350,10 @@ namespace Edu.WebApi.Controllers.Course
OrderStateName = x.OrderState.ToName(), OrderStateName = x.OrderState.ToName(),
x.EnterID, x.EnterID,
EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "", EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "",
x.CreateBy,
CreateByName = UserReidsCache.GetUserLoginInfo(x.CreateBy)?.AccountName ?? "",
x.CourseConsultantId,
ConsultantName = UserReidsCache.GetUserLoginInfo(x.CourseConsultantId)?.AccountName ?? "",
YFCommissionMoney = GetOrderYFCommission(x), YFCommissionMoney = GetOrderYFCommission(x),
x.CommissionMoney, x.CommissionMoney,
x.ExtraCommissionMoney, x.ExtraCommissionMoney,
...@@ -755,6 +763,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -755,6 +763,10 @@ namespace Edu.WebApi.Controllers.Course
OrderStateName = model.OrderState.ToName(), OrderStateName = model.OrderState.ToName(),
model.EnterID, model.EnterID,
EnterName = UserReidsCache.GetUserLoginInfo(model.EnterID)?.AccountName ?? "", EnterName = UserReidsCache.GetUserLoginInfo(model.EnterID)?.AccountName ?? "",
model.CreateBy,
CreateByName = UserReidsCache.GetUserLoginInfo(model.CreateBy)?.AccountName ?? "",
model.CourseConsultantId,
ConsultantName = UserReidsCache.GetUserLoginInfo(model.CourseConsultantId)?.AccountName ?? "",
model.CommissionMoney, model.CommissionMoney,
model.ExtraRewardMoney, model.ExtraRewardMoney,
model.ExtraDeductMoney, model.ExtraDeductMoney,
...@@ -1378,6 +1390,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1378,6 +1390,10 @@ namespace Edu.WebApi.Controllers.Course
OrderSourceName = x.OrderSource.ToName(), OrderSourceName = x.OrderSource.ToName(),
x.EnterID, x.EnterID,
EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "", EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "",
x.CreateBy,
CreateByName = UserReidsCache.GetUserLoginInfo(x.CreateBy)?.AccountName ?? "",
x.CourseConsultantId,
ConsultantName = UserReidsCache.GetUserLoginInfo(x.CourseConsultantId)?.AccountName ?? "",
YFCommissionMoney = GetOrderYFCommission(x), YFCommissionMoney = GetOrderYFCommission(x),
x.CommissionMoney, x.CommissionMoney,
x.ExtraCommissionMoney, x.ExtraCommissionMoney,
...@@ -1567,6 +1583,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1567,6 +1583,10 @@ namespace Edu.WebApi.Controllers.Course
OrderSourceName = x.OrderSource.ToName(), OrderSourceName = x.OrderSource.ToName(),
x.EnterID, x.EnterID,
EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "", EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "",
x.CreateBy,
CreateByName = UserReidsCache.GetUserLoginInfo(x.CreateBy)?.AccountName ?? "",
x.CourseConsultantId,
ConsultantName = UserReidsCache.GetUserLoginInfo(x.CourseConsultantId)?.AccountName ?? "",
YFCommissionMoney = GetOrderYFCommission(x), YFCommissionMoney = GetOrderYFCommission(x),
x.CommissionMoney, x.CommissionMoney,
x.ExtraCommissionMoney, x.ExtraCommissionMoney,
...@@ -1901,6 +1921,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1901,6 +1921,10 @@ namespace Edu.WebApi.Controllers.Course
OrderStateName = x.OrderState.ToName(), OrderStateName = x.OrderState.ToName(),
x.EnterID, x.EnterID,
EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "", EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "",
x.CreateBy,
CreateByName = UserReidsCache.GetUserLoginInfo(x.CreateBy)?.AccountName ?? "",
x.CourseConsultantId,
ConsultantName = UserReidsCache.GetUserLoginInfo(x.CourseConsultantId)?.AccountName ?? "",
x.CommissionMoney, x.CommissionMoney,
x.ExtraRewardMoney, x.ExtraRewardMoney,
x.ExtraDeductMoney, x.ExtraDeductMoney,
...@@ -2023,6 +2047,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -2023,6 +2047,10 @@ namespace Edu.WebApi.Controllers.Course
OrderStateName = x.OrderState.ToName(), OrderStateName = x.OrderState.ToName(),
x.EnterID, x.EnterID,
EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "", EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "",
x.CreateBy,
CreateByName = UserReidsCache.GetUserLoginInfo(x.CreateBy)?.AccountName ?? "",
x.CourseConsultantId,
ConsultantName = UserReidsCache.GetUserLoginInfo(x.CourseConsultantId)?.AccountName ?? "",
x.CommissionMoney, x.CommissionMoney,
x.ExtraRewardMoney, x.ExtraRewardMoney,
x.ExtraDeductMoney, x.ExtraDeductMoney,
......
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