Skip to content

E
Education
Commit c92c928c authored by liudong1993's avatar liudong1993
Browse files
Options

学生名单

parent 938f5867
Hide whitespace changes
Inline Side-by-side
Showing with 745 additions and 9 deletions
Edu.Model/Entity/Course/RB_Order_Guest.cs
View file @ c92c928c
......@@ -21,6 +21,11 @@ namespace Edu.Model.Entity.Course
/// </summary>
public int OrderId { get; set; }
/// <summary>
/// 班级id
/// </summary>
public int ClassId { get; set; }
/// <summary>
/// 客人名称
/// </summary>
......
Edu.Model/Entity/Course/RB_Order_Remark.cs
View file @ c92c928c
......@@ -31,6 +31,11 @@ namespace Edu.Model.Entity.Course
/// </summary>
public string Content { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
......
Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs
View file @ c92c928c
......@@ -9,6 +9,9 @@ namespace Edu.Model.ViewModel.Course
[Serializable]
public class RB_Order_Guest_ViewModel : Model.Entity.Course.RB_Order_Guest
{
/// <summary>
/// 订单ids
/// </summary>
public string OrderIds { get; set; }
}
}
\ No newline at end of file
Edu.Model/ViewModel/Course/RB_Order_Remark_ViewModel.cs 0 → 100644
View file @ c92c928c
using System;
using System.Collections.Generic;
namespace Edu.Model.ViewModel.Course
{
/// <summary>
/// 订单实体类
/// </summary>
[Serializable]
public class RB_Order_Remark_ViewModel : Model.Entity.Course.RB_Order_Remark
{
}
}
\ No newline at end of file
Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs
View file @ c92c928c
......@@ -33,5 +33,26 @@ namespace Edu.Model.ViewModel.Course
/// 排序
/// </summary>
public int Q_OrderBy { get; set; }
/// <summary>
/// 销售备注
/// </summary>
public List<RB_Order_Remark_ViewModel> SaleRemarkList { get; set; }
/// <summary>
/// 教务备注
/// </summary>
public List<RB_Order_Remark_ViewModel> TeacherRemarkList { get; set; }
/// <summary>
/// 校长备注
/// </summary>
public List<RB_Order_Remark_ViewModel> RectorRemarkList { get; set; }
/// <summary>
/// 经理备注
/// </summary>
public List<RB_Order_Remark_ViewModel> DirectorRemarkList { get; set; }
/// <summary>
/// 客人列表
/// </summary>
public List<RB_Order_Guest_ViewModel> GuestList { get; set; }
}
}
\ No newline at end of file
Edu.Module.Course/Edu.Module.Course.csproj
View file @ c92c928c
......@@ -6,6 +6,7 @@
<ItemGroup>
<ProjectReference Include="..\Edu.Aop\Edu.Aop.csproj" />
<ProjectReference Include="..\Edu.Cache\Edu.Cache.csproj" />
<ProjectReference Include="..\Edu.Common\Edu.Common.csproj" />
<ProjectReference Include="..\Edu.Model\Edu.Model.csproj" />
<ProjectReference Include="..\Edu.Repository\Edu.Repository.csproj" />
......
Edu.Module.Course/OrderModule.cs
View file @ c92c928c
using Edu.Common.Enum;
using Edu.Cache.User;
using Edu.Common.API;
using Edu.Common.Enum;
using Edu.Common.Plugin;
using Edu.Model.CacheModel;
using Edu.Model.ViewModel.Course;
using Edu.Repository.Course;
using Edu.Repository.Log;
using Edu.Repository.User;
using System;
using System.Collections.Generic;
using System.Linq;
using VT.FW.DB;
namespace Edu.Module.Course
......@@ -21,10 +28,403 @@ namespace Edu.Module.Course
/// </summary>
private readonly RB_Order_RemarkRepository order_RemarkRepository = new RB_Order_RemarkRepository();
/// <summary>
/// 客人
/// </summary>
private readonly RB_Order_GuestRepository order_GuestRepository = new RB_Order_GuestRepository();
/// <summary>
/// 用户日志
/// </summary>
private readonly RB_User_ChangeLogRepository changeLogRepository = new RB_User_ChangeLogRepository();
/// <summary>
/// 班级
/// </summary>
private readonly RB_ClassRepository classRepository = new RB_ClassRepository();
/// <summary>
/// 教师
/// </summary>
private readonly RB_TeacherRepository teacherRepository = new RB_TeacherRepository();
/// <summary>
/// 获取班级订单列表
/// </summary>
/// <param name="classId"></param>
/// <param name="groupId"></param>
/// <returns></returns>
public List<RB_Order_ViewModel> GetClassOrderList(int classId,int groupId, out object ClassInfo)
{
var cModel = classRepository.GetEntity(classId);
if (cModel == null) {
ClassInfo = new { };
return new List<RB_Order_ViewModel>();
}
//获取班级教师
var tModel = teacherRepository.GetEntity(cModel.Teacher_Id);
//获取订单列表
var orderList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = groupId, ClassId = classId });
if (orderList.Any()) {
string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
//获取备注列表
var remarkList = order_RemarkRepository.GetList(new RB_Order_Remark_ViewModel() { }, orderIds);
//获取名单列表
var guestList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { OrderIds = orderIds });
foreach (var item in orderList) {
item.SaleRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 1).ToList();
item.TeacherRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 2).ToList();
item.RectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 3).ToList();
item.DirectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 4).ToList();
item.GuestList = guestList.Where(x => x.OrderId == item.OrderId).ToList();
}
}
ClassInfo = new
{
cModel.ClassName,
tModel?.TeacherName,
tModel?.TeacherIcon
};
return orderList;
}
/// <summary>
/// 更新订单销售
/// </summary>
/// <param name="orderId"></param>
/// <param name="enterID"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public string UpdateOrderSale(int orderId, int enterID, UserInfo userInfo)
{
var orderModel = orderRepository.GetEntity(orderId);
if (orderModel == null) { return "订单不存在，请核实后再试"; }
if (orderModel.EnterID == enterID)
{
return "不能转交给同一人";
}
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Order_ViewModel.EnterID),enterID}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Order_ViewModel.OrderId),
FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal
}
};
bool flag = orderRepository.Update(keyValues, wheres);
if (flag) {
changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
{
Id = 0,
Type = 2,
CreateBy = userInfo.Id,
CreateTime = DateTime.Now,
Group_Id = userInfo.Group_Id,
LogContent = "修改销售，由" + (UserReidsCache.GetUserLoginInfo(orderModel.EnterID)?.AccountName ?? "") + "(" + orderModel.EnterID + ") 修改为" + (UserReidsCache.GetUserLoginInfo(enterID)?.AccountName ?? "") + "(" + enterID + ")"
});
}
return flag ? "" : "操作失败，请联系管理员";
}
/// <summary>
/// 修改备注
/// </summary>
/// <param name="orderId"></param>
/// <param name="type"></param>
/// <param name="remark"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public bool UpdateOrderRemark(int orderId, int type, string remark, UserInfo userInfo)
{
var orderModel = orderRepository.GetEntity(orderId);
if (orderModel == null) { return false; }
Dictionary<string, object> keyValues = new Dictionary<string, object>() { };
string LogContent = "";
if (type == 1)
{
if (orderModel.TeacherRemark == remark) { return true; }
keyValues.Add(nameof(RB_Order_ViewModel.TeacherRemark), remark);
LogContent = "修改教务备注：由【" + orderModel.TeacherRemark + "】修改为【" + remark + "】";
}
else if (type == 2)
{
if (orderModel.RectorRemark == remark) { return true; }
keyValues.Add(nameof(RB_Order_ViewModel.RectorRemark), remark);
LogContent = "修改校长备注：由【" + orderModel.RectorRemark + "】修改为【" + remark + "】";
}
else if (type == 3)
{
if (orderModel.DirectorRemark == remark) { return true; }
keyValues.Add(nameof(RB_Order_ViewModel.DirectorRemark), remark);
LogContent = "修改经理备注：由【" + orderModel.DirectorRemark + "】修改为【" + remark + "】";
}
else { return false; }
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Order_ViewModel.OrderId),
FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal
}
};
var flag = orderRepository.Update(keyValues, wheres);
if (flag)
{
changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
{
Id = 0,
Type = 2,
CreateBy = userInfo.Id,
CreateTime = DateTime.Now,
Group_Id = userInfo.Group_Id,
LogContent = LogContent
});
}
return flag;
}
/// <summary>
/// 修改提成
/// </summary>
/// <param name="orderId"></param>
/// <param name="type"></param>
/// <param name="commissionMoney"></param>
/// <param name="extraRewardMoney"></param>
/// <param name="extraDeductMoney"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public bool UpdateOrderCommission(int orderId, int type, decimal commissionMoney, decimal extraRewardMoney, decimal extraDeductMoney, UserInfo userInfo)
{
var orderModel = orderRepository.GetEntity(orderId);
if (orderModel == null) { return false; }
if (type == 1)
{
if (orderModel.IsCommissionGive != 1)
{
return false;
}
if (orderModel.CommissionMoney == commissionMoney) { return true; }
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Order_ViewModel.CommissionMoney),commissionMoney}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Order_ViewModel.OrderId),
FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal
}
};
var flag = orderRepository.Update(keyValues, wheres);
if (flag)
{
changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
{
Id = 0,
Type = 2,
CreateBy = userInfo.Id,
CreateTime = DateTime.Now,
Group_Id = userInfo.Group_Id,
LogContent = "修改提成，由【" + orderModel.CommissionMoney + "】修改为【" + commissionMoney + "】"
});
}
return flag;
}
else {
if (orderModel.ExtraRewardMoney != extraRewardMoney || orderModel.ExtraDeductMoney != extraDeductMoney)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Order_ViewModel.ExtraRewardMoney),extraRewardMoney},
{ nameof(RB_Order_ViewModel.ExtraDeductMoney),extraDeductMoney}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Order_ViewModel.OrderId),
FiledValue=orderId,
OperatorEnum=OperatorEnum.Equal
}
};
var flag = orderRepository.Update(keyValues, wheres);
if (flag)
{
string LogContent = "修改额外金额";
if (orderModel.ExtraRewardMoney != extraRewardMoney)
{
LogContent += "，额外奖励由【" + orderModel.ExtraRewardMoney + "】修改为【" + extraRewardMoney + "】";
}
if (orderModel.ExtraDeductMoney != extraDeductMoney)
{
LogContent += "，额外扣除由【" + orderModel.ExtraDeductMoney + "】修改为【" + extraDeductMoney + "】";
}
changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
{
Id = 0,
Type = 2,
CreateBy = userInfo.Id,
CreateTime = DateTime.Now,
Group_Id = userInfo.Group_Id,
LogContent = LogContent
});
}
return flag;
}
else {
return true;
}
}
}
#region 学生名单
/// <summary>
/// 获取学生名单列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Order_Guest_ViewModel> GetOrderGuestPageList(int pageIndex, int pageSize, out long count, RB_Order_Guest_ViewModel dmodel)
{
var list = order_GuestRepository.GetPageList(pageIndex, pageSize, out count, dmodel);
return list;
}
/// <summary>
/// 新增修改 学生
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public bool SetOrderGuestInfo(RB_Order_Guest_ViewModel dmodel)
{
if (dmodel.Id > 0)
{
var gModel = order_GuestRepository.GetEntity(dmodel.Id);
string LogContent = "修改学生名单【" + dmodel.Id + "】";
gModel.Age = dmodel.Age;
if (gModel.Age != dmodel.Age)
{
LogContent += "，年龄由【" + gModel.Age + "】修改为【" + dmodel.Age + "】";
}
gModel.Basics = dmodel.Basics;
if (gModel.Basics != dmodel.Basics)
{
LogContent += "，日语基础由【" + gModel.Basics + "】修改为【" + dmodel.Basics + "】";
}
gModel.Contact = dmodel.Contact;
if (gModel.Contact != dmodel.Contact)
{
LogContent += "，紧急联系人由【" + gModel.Contact + "】修改为【" + dmodel.Contact + "】";
}
gModel.ContactMobile = dmodel.ContactMobile;
if (gModel.ContactMobile != dmodel.ContactMobile)
{
LogContent += "，紧急联系电话由【" + gModel.ContactMobile + "】修改为【" + dmodel.ContactMobile + "】";
}
gModel.Education = dmodel.Education;
if (gModel.Education != dmodel.Education)
{
LogContent += "，学历由【" + gModel.Education.ToName() + "】修改为【" + dmodel.Education.ToName() + "】";
}
gModel.GuestName = dmodel.GuestName;
if (gModel.GuestName != dmodel.GuestName)
{
LogContent += "，客人名称由【" + gModel.GuestName + "】修改为【" + dmodel.GuestName + "】";
}
gModel.GuestSource = dmodel.GuestSource;
if (gModel.GuestSource != dmodel.GuestSource)
{
LogContent += "，客人来源由【" + gModel.GuestSource.ToName() + "】修改为【" + dmodel.GuestSource.ToName() + "】";
}
gModel.LearningGoals = dmodel.LearningGoals;
if (gModel.LearningGoals != dmodel.LearningGoals)
{
LogContent += "，学习目的由【" + gModel.LearningGoals.ToName() + "】修改为【" + dmodel.LearningGoals.ToName() + "】";
}
gModel.Mobile = dmodel.Mobile;
if (gModel.Mobile != dmodel.Mobile)
{
LogContent += "，手机号码由【" + gModel.Mobile + "】修改为【" + dmodel.Mobile + "】";
}
gModel.Profession = dmodel.Profession;
if (gModel.Profession != dmodel.Profession)
{
LogContent += "，职业由【" + gModel.Profession + "】修改为【" + dmodel.Profession + "】";
}
gModel.Sex = dmodel.Sex;
if (gModel.Sex != dmodel.Sex)
{
LogContent += "，性别由【" + gModel.Sex + "】修改为【" + dmodel.Sex + "】";
}
gModel.UpdateTime = dmodel.UpdateTime;
bool flag = order_GuestRepository.Update(gModel);
if (flag)
{
changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
{
Id = 0,
Type = 2,
CreateBy = dmodel.CreateBy,
CreateTime = DateTime.Now,
Group_Id = dmodel.Group_Id,
LogContent = LogContent
});
}
return flag;
}
else {
int Id = order_GuestRepository.Insert(dmodel);
bool flag = Id > 0;
if (flag)
{
changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
{
Id = 0,
Type = 2,
CreateBy = dmodel.CreateBy,
CreateTime = DateTime.Now,
Group_Id = dmodel.Group_Id,
LogContent = "新增学生名单【" + Id + "】"
});
}
return flag;
}
}
/// <summary>
/// 删除学生名单
/// </summary>
/// <param name="guestId"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public bool DelOrderGuestInfo(int guestId, UserInfo userInfo)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Order_Guest_ViewModel.Status),1}
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Order_Guest_ViewModel.Id),
FiledValue=guestId,
OperatorEnum=OperatorEnum.Equal
}
};
bool flag = order_GuestRepository.Update(keyValues, wheres);
if (flag)
{
changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
{
Id = 0,
Type = 2,
CreateBy = userInfo.Id,
CreateTime = DateTime.Now,
Group_Id = userInfo.Group_Id,
LogContent = "删除学生名单【" + guestId + "】"
});
}
return flag;
}
#endregion
}
}
Edu.Repository/Course/RB_Order_GuestRepository.cs
View file @ c92c928c
......@@ -34,6 +34,14 @@ namespace Edu.Repository.Course
{
where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
}
if (demodel.ClassId > 0)
{
where += $@" and {nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
}
if (!string.IsNullOrEmpty(demodel.OrderIds))
{
where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} in({demodel.OrderIds})";
}
if (!string.IsNullOrEmpty(demodel.GuestName))
{
where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
......@@ -56,7 +64,7 @@ namespace Edu.Repository.Course
/// <param name="demodel"></param>
/// <param name="orderIds"></param>
/// <returns></returns>
public List<RB_Order_Guest_ViewModel> GetClassPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
public List<RB_Order_Guest_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
{
string where = $@" 1=1 and Status=0";
if (demodel.Group_Id > 0)
......@@ -71,6 +79,10 @@ namespace Edu.Repository.Course
{
where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
}
if (demodel.ClassId > 0)
{
where += $@" and {nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
}
if (!string.IsNullOrEmpty(demodel.GuestName))
{
where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
......
Edu.Repository/Course/RB_Order_RemarkRepository.cs
View file @ c92c928c
......@@ -19,7 +19,7 @@ namespace Edu.Repository.Course
/// <param name="demodel"></param>
/// <param name="orderIds"></param>
/// <returns></returns>
public List<RB_Order_Remark> GetList(RB_Order_Remark demodel,string orderIds)
public List<RB_Order_Remark_ViewModel> GetList(RB_Order_Remark_ViewModel demodel,string orderIds)
{
string where = $@" 1=1";
......@@ -37,7 +37,7 @@ namespace Edu.Repository.Course
}
string sql = $@" select * from RB_Order_Remark where {where}";
return Get<RB_Order_Remark>(sql).ToList();
return Get<RB_Order_Remark_ViewModel>(sql).ToList();
}
/// <summary>
......@@ -49,7 +49,7 @@ namespace Edu.Repository.Course
/// <param name="demodel"></param>
/// <param name="orderIds"></param>
/// <returns></returns>
public List<RB_Order_Remark> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Remark demodel, string orderIds)
public List<RB_Order_Remark_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Remark_ViewModel demodel, string orderIds)
{
string where = $@" 1=1";
......@@ -67,7 +67,7 @@ namespace Edu.Repository.Course
}
string sql = $@" select * from RB_Order_Remark where {where}";
return GetPage<RB_Order_Remark>(pageIndex, pageSize, out rowsCount, sql).ToList();
return GetPage<RB_Order_Remark_ViewModel>(pageIndex, pageSize, out rowsCount, sql).ToList();
}
}
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ c92c928c
using System;
using System.Linq;
using Edu.Cache.User;
using Edu.Common.API;
using Edu.Common.Plugin;
......@@ -7,6 +8,7 @@ using Edu.Module.Course;
using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
namespace Edu.WebApi.Controllers.Course
{
......@@ -17,12 +19,285 @@ namespace Edu.WebApi.Controllers.Course
public class OrderController : BaseController
{
/// <summary>
/// 班级处理类对象
/// 订单处理类对象
/// </summary>
private readonly ClassModule classModule = new ClassModule();
private readonly OrderModule orderModule = new OrderModule();
#region 订单管理
/// <summary>
/// 获取班级订单列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetClassOrderList()
{
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
var userInfo = base.UserInfo;
int ClassId = parms.GetInt("ClassId", 0);
if (ClassId <= 0) {
return ApiResult.ParamIsNull();
}
var orderList = orderModule.GetClassOrderList(ClassId, userInfo.Group_Id, out object ClassInfo);
return ApiResult.Success("", new
{
ClassInfo,
OrderList = new
{
NorList = orderList.Where(x => x.OrderState != Common.Enum.Course.OrderStateEnum.Cancel).Select(x => new
{
x.OrderId,
x.ClassId,
x.TradeWay,
x.Class_Price,
x.Unit_Price,
x.GuestNum,
x.PreferPrice,
x.Income,
x.Refund,
x.DiscountMoney,
x.OrderState,
OrderStateName = x.OrderState.ToName(),
x.EnterID,
EnterName = UserReidsCache.GetUserLoginInfo(x.EnterID)?.AccountName ?? "",
x.CommissionMoney,
x.ExtraRewardMoney,
x.ExtraDeductMoney,
x.IsCommissionGive,
CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
x.SaleRemark,
x.TeacherRemark,
x.RectorRemark,
x.DirectorRemark,
SaleRemarkList = x.SaleRemarkList.Select(z => new
{
z.Id,
z.Content,
CreateBy = UserReidsCache.GetUserLoginInfo(z.CreateBy)?.AccountName ?? "",
CreateTime = z.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
}),
TeacherRemarkList = x.TeacherRemarkList.Select(z => new
{
z.Id,
z.Content,
CreateBy = UserReidsCache.GetUserLoginInfo(z.CreateBy)?.AccountName ?? "",
CreateTime = z.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
}),
RectorRemarkList = x.RectorRemarkList.Select(z => new
{
z.Id,
z.Content,
CreateBy = UserReidsCache.GetUserLoginInfo(z.CreateBy)?.AccountName ?? "",
CreateTime = z.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
}),
DirectorRemarkList = x.DirectorRemarkList.Select(z => new
{
z.Id,
z.Content,
CreateBy = UserReidsCache.GetUserLoginInfo(z.CreateBy)?.AccountName ?? "",
CreateTime = z.CreateTime.ToString("yyyy-MM-dd HH:mm:ss")
}),
GuestList = x.GuestList.Select(z => new
{
z.Id,
z.GuestName,
z.GuestState
})
})
}
});
}
/// <summary>
/// 修改订单销售
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult UpdateOrderSale() {
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
var userInfo = base.UserInfo;
int OrderId = parms.GetInt("OrderId", 0);
int EnterID = parms.GetInt("EnterID", 0);
if (OrderId <= 0)
{
return ApiResult.ParamIsNull("请传递订单id");
}
if (EnterID <= 0)
{
return ApiResult.ParamIsNull("请传递销售id");
}
string msg = orderModule.UpdateOrderSale(OrderId, EnterID, userInfo);
if (msg == "")
{
return ApiResult.Success();
}
else {
return ApiResult.Failed(msg);
}
}
/// <summary>
/// 修改订单备注
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult UpdateOrderRemark() {
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
var userInfo = base.UserInfo;
int OrderId = parms.GetInt("OrderId", 0);
int Type = parms.GetInt("Type", 0);// 类型 1教务 2校长 3经理
string Remark = parms.GetStringValue("Remark");
if (OrderId <= 0)
{
return ApiResult.ParamIsNull("请传递订单id");
}
if (Type <= 0)
{
return ApiResult.ParamIsNull("请传递类型");
}
bool flag = orderModule.UpdateOrderRemark(OrderId, Type, Remark, userInfo);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
/// <summary>
/// 修改订单提成
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult UpdateOrderCommission() {
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
var userInfo = base.UserInfo;
int OrderId = parms.GetInt("OrderId", 0);
decimal CommissionMoney = parms.GetDecimal("CommissionMoney");
decimal ExtraRewardMoney = parms.GetDecimal("ExtraRewardMoney");
decimal ExtraDeductMoney = parms.GetDecimal("ExtraDeductMoney");
int Type = parms.GetInt("Type", 1);// 类型 1提成 2额外金额
if (OrderId <= 0)
{
return ApiResult.ParamIsNull("请传递订单id");
}
bool flag = orderModule.UpdateOrderCommission(OrderId, Type, CommissionMoney, ExtraRewardMoney, ExtraDeductMoney, userInfo);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
#endregion
#region 学生名单
/// <summary>
/// 获取学生名单分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetOrderGuestPageList()
{
var userInfo = base.UserInfo;
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var dmodel = JsonHelper.DeserializeObject<RB_Order_Guest_ViewModel>(RequestParm.Msg.ToString());
dmodel.Group_Id = userInfo.Group_Id;
var list = orderModule.GetOrderGuestPageList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
pageModel.Count = Convert.ToInt32(count);
pageModel.PageData = list.Select(x => new
{
x.Id,
x.GuestName,
x.GuestState,
x.Profession,
x.Sex,
x.Age,
x.Mobile,
x.Basics,
x.Education,
EducationName = x.Education.ToName(),
x.GuestSource,
GuestSourceName = x.GuestSource.ToName(),
x.LearningGoals,
LearningGoalsName = x.LearningGoals.ToName(),
x.Contact,
x.ContactMobile,
UpdateTime = x.UpdateTime.ToString("yyyy-MM-dd HH:mm:ss")
});
return ApiResult.Success("", pageModel);
}
/// <summary>
/// 新增 修改客人
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderGuestInfo() {
var userInfo = base.UserInfo;
var dmodel = JsonHelper.DeserializeObject<RB_Order_Guest_ViewModel>(RequestParm.Msg.ToString());
if (dmodel.OrderId <= 0) {
return ApiResult.ParamIsNull("请传递订单id");
}
if (string.IsNullOrEmpty(dmodel.GuestName)) {
return ApiResult.ParamIsNull("请输入客人姓名");
}
dmodel.GuestState = 1;
dmodel.Status = 0;
dmodel.Group_Id = userInfo.Group_Id;
dmodel.School_Id = userInfo.School_Id;
dmodel.CreateBy = userInfo.Id;
dmodel.CreateTime = DateTime.Now;
dmodel.UpdateBy = userInfo.Id;
dmodel.UpdateTime = DateTime.Now;
bool flag = orderModule.SetOrderGuestInfo(dmodel);
if (flag)
{
return ApiResult.Success();
}
else {
return ApiResult.Failed();
}
}
/// <summary>
/// 删除客人
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelOrderGuestInfo() {
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
var userInfo = base.UserInfo;
int GuestId = parms.GetInt("GuestId", 0);
if (GuestId <= 0)
{
return ApiResult.ParamIsNull("");
}
bool flag = orderModule.DelOrderGuestInfo(GuestId, userInfo);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
#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