Skip to content

E
Education
Commit 037fc5c0 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 173a149b
Show whitespace changes
Inline Side-by-side
Showing with 134 additions and 22 deletions
Edu.Module.Course/StudentBillModule.cs
View file @ 037fc5c0
......@@ -122,7 +122,7 @@ namespace Edu.Module.Course
//课时单价
var classHourPrice = Math.Round(orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours, 2);
//预计退款金额
var backMoney =(classModel.ClassHours - FinishHours) * classHourPrice;
var backMoney = (classModel.ClassHours - FinishHours) * classHourPrice;
var obj = new
{
orderModel.PreferPrice,
......@@ -130,7 +130,7 @@ namespace Edu.Module.Course
classModel.ClassHours,
FinishHours,
classHourPrice,
backMoney = Math.Round(backMoney,2)
backMoney = Math.Round(backMoney, 2)
};
return obj;
}
......@@ -145,7 +145,7 @@ namespace Edu.Module.Course
/// <param name="message">返回提示信息</param>
/// <param name="BackMoney"></param>
/// <returns></returns>
public virtual bool SetBackBillAduitModule(int BackId, int AuditStatus, string Description, UserInfo user, out string message,int SpecialNode=0, decimal BackMoney = 0,string RecipientIds="")
public virtual bool SetBackBillAduitModule(int BackId, int AuditStatus, string Description, UserInfo user, out string message, int SpecialNode = 0, decimal BackMoney = 0, string RecipientIds = "")
{
message = "";
bool flag = false;
......@@ -233,7 +233,7 @@ namespace Edu.Module.Course
#endregion
#region 更新退课单据为驳回状态
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Rejected, newRecipientIds, backModel.BackId,SpecialNode:SpecialNode,BackMoney:BackMoney);
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Rejected, newRecipientIds, backModel, SpecialNode: SpecialNode, BackMoney: BackMoney);
#endregion
}
//审核通过
......@@ -290,7 +290,7 @@ namespace Edu.Module.Course
flag = UpdateStuRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion
//更新主表状态
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Pass, newRecipientIds, backModel.BackId, SpecialNode: SpecialNode, BackMoney: BackMoney);
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Pass, newRecipientIds, backModel, SpecialNode: SpecialNode, BackMoney: BackMoney);
#region 更新订单旅客表未通过状态
flag = UpdateOrderGuestStatusModule(2, backModel.StudentId);
#endregion
......@@ -348,7 +348,7 @@ namespace Edu.Module.Course
}
}
//更新主表状态
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Pass, newRecipientIds, backModel.BackId, SpecialNode: SpecialNode, BackMoney: BackMoney);
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Pass, newRecipientIds, backModel, SpecialNode: SpecialNode, BackMoney: BackMoney);
#region 更新订单旅客表未通过状态
flag = UpdateOrderGuestStatusModule(2, backModel.StudentId);
#endregion
......@@ -385,19 +385,11 @@ namespace Edu.Module.Course
flag = UpdateStuRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion
//更新主表状态
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Pass, newRecipientIds, backModel.BackId, SpecialNode: SpecialNode, BackMoney: BackMoney);
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Pass, newRecipientIds, backModel, SpecialNode: SpecialNode, BackMoney: BackMoney);
#region 更新订单旅客表未通过状态
flag = UpdateOrderGuestStatusModule(2, backModel.StudentId);
#endregion
}
//更新抄送人状态
//var CopyToPeopleList = copyToPeopleRepository.GetCopyToPeopleList(WorkFlowId, TemplateType);
//foreach (var item in CopyToPeopleList)
//{
// item.Stauts = WFRrocessStatus.AuditThrough;
//}
//CopyAccountList = CopyToPeopleList.Select(x => new EmAccoutIdModel { EmAccount = x.EmLoginMobile, EmployeeId = x.EmployeeId ?? 0 }).Distinct().ToList();
//copyToPeopleRepository.UpdateBatch(CopyToPeopleList, trans);
}
//同时创建下一步审核 复制审核人到审核关联表 创建审核记录表
else
......@@ -562,11 +554,11 @@ namespace Edu.Module.Course
/// </summary>
/// <param name="statusEnum">审核状态</param>
/// <param name="newRecipientIds">抄送人</param>
/// <param name="BackId">退课表主键编号</param>
/// <param name="backModel">退课表实体信息</param>
/// <param name="SpecialNode">是否是特殊节点(1-是)</param>
/// <param name="BackMoney">实际退款金额</param>
/// <returns></returns>
private bool UpdateStuBackBillStatusModule(BackClassAuditStatusEnum statusEnum, string newRecipientIds, int BackId,int SpecialNode=0,decimal BackMoney=0)
private bool UpdateStuBackBillStatusModule(BackClassAuditStatusEnum statusEnum, string newRecipientIds, RB_Student_BackClass backModel, int SpecialNode = 0, decimal BackMoney = 0)
{
Dictionary<string, object> backFileds = new Dictionary<string, object>()
{
......@@ -581,7 +573,21 @@ namespace Edu.Module.Course
{
backFileds.Add(nameof(RB_Student_BackClass_ViewModel.RealityBackMoney), BackMoney);
}
bool flag = student_BackClassRepository.Update(backFileds, new WhereHelper(nameof(RB_Student_BackClass_ViewModel.BackId), BackId));
bool flag = student_BackClassRepository.Update(backFileds, new WhereHelper(nameof(RB_Student_BackClass_ViewModel.BackId), backModel.BackId));
if (flag)
{
var guestList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { OrderId = backModel.OrderId });
if (guestList != null && guestList.Where(qitem => qitem.GuestState == 2).Count() == guestList.Count())
{
//更新订单为退学状态
Dictionary<string, object> orderFileds = new Dictionary<string, object>()
{
{nameof(RB_Order.OrderState),OrderStateEnum.DropOut }
};
flag = orderRepository.Update(orderFileds, new WhereHelper(nameof(RB_Order.OrderId), backModel.OrderId));
}
}
return flag;
}
......@@ -660,7 +666,7 @@ namespace Edu.Module.Course
if (!string.IsNullOrEmpty(auditRelevance.PostIds))
{
var postList = Common.ConvertHelper.StringToList(auditRelevance.PostIds);
if (postList != null&& postList.Count>0)
if (postList != null && postList.Count > 0)
{
foreach (var item in postList)
{
......@@ -780,7 +786,7 @@ namespace Edu.Module.Course
{
NodeName = "制单人",
AduitStatus = 2,
AuditWayName="",
AuditWayName = "",
AduitStatusName = "发起",
SubList = new List<object>()
{
......@@ -938,5 +944,84 @@ namespace Edu.Module.Course
#endregion
return msg;
}
/// <summary>
/// 学员续课订单
/// </summary>
/// <param name="orderId"></param>
/// <param name="guestId"></param>
/// <param name="orderModel">订单实体类</param>
/// <param name="message">提示信息</param>
/// <returns></returns>
public bool RenewOrderModule(int orderId, int guestId, RB_Order_ViewModel orderModel, out string message)
{
bool flag = false;
message = "";
var oldOrderModel = orderRepository.GetEntity(orderId);
if (oldOrderModel == null)
{
message = "原订单不存在!请核实在重新申请!";
flag = false;
return flag;
}
if (oldOrderModel.OrderState == OrderStateEnum.Cancel)
{
message = "原订单已取消!请核实在重新申请!";
flag = false;
return flag;
}
var oldGuestModel = order_GuestRepository.GetEntity(guestId);
if (oldGuestModel == null)
{
message = "原旅客信息不存在!请核实在重新申请!";
flag = false;
return flag;
}
if (oldGuestModel.GuestState != 1)
{
message = "原旅客状态不正确!请核实在重新申请!";
flag = false;
return flag;
}
orderModel.EnterID = oldOrderModel.EnterID;
//新增订单
var newOrderId = orderRepository.Insert(orderModel);
orderModel.OrderId = newOrderId;
flag = newOrderId > 0;
if (flag)
{
//新增旅客
var guestModel = new RB_Order_Guest()
{
OrderId = orderModel.OrderId,
ClassId = orderModel.ClassId,
GuestName = oldGuestModel.GuestName,
GuestState = 1,
Profession = oldGuestModel?.Profession ?? "",
Sex = oldGuestModel?.Sex ?? 1,
Age = oldGuestModel?.Age ?? 0,
Mobile = oldGuestModel?.Mobile ?? "",
Basics = oldGuestModel?.Basics ?? "",
Education = oldGuestModel?.Education ?? 0,
GuestSource = oldGuestModel?.GuestSource ?? 0,
LearningGoals = oldGuestModel?.LearningGoals ?? 0,
Contact = oldGuestModel?.Contact ?? "",
ContactMobile = oldGuestModel?.ContactMobile ?? "",
Status = 0,
Group_Id = orderModel.Group_Id,
School_Id = orderModel?.School_Id ?? 0,
CreateBy = orderModel.CreateBy,
CreateTime = orderModel.CreateTime,
UpdateBy = orderModel.UpdateBy,
UpdateTime = orderModel.UpdateTime,
DropOutRemark = "",
};
var newGuestId = order_GuestRepository.Insert(guestModel);
guestModel.Id = newGuestId;
flag = newGuestId > 0;
}
return flag;
}
}
}
Edu.WebApi/Controllers/Course/StuController.cs
View file @ 037fc5c0
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using Edu.Cache.User;
using Edu.Common.API;
using Edu.Common.Enum.Course;
......@@ -167,5 +168,31 @@ namespace Edu.WebApi.Controllers.Course
string msg = studentBillModule.SetStudentBackFinance(BackClassId, IsPublic, CurrencyId, ClientType, ClientId, userInfo);
return string.IsNullOrEmpty(msg) ? ApiResult.Success() : ApiResult.Failed(msg);
}
/// <summary>
/// 学员续费订单
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult RenewOrder()
{
//订单编号
int OrderId = base.ParmJObj.GetInt("OrderId");
//学员编号
int guestId = base.ParmJObj.GetInt("GuestId");
var orderModel = new RB_Order_ViewModel()
{
SaleRemark="学员续费",
CreateBy=base.UserInfo.Id,
CreateTime=DateTime.Now,
UpdateBy=base.UserInfo.Id,
UpdateTime=DateTime.Now,
Dept_Id=base.UserInfo.DeptId,
Group_Id=base.UserInfo.Group_Id,
};
bool flag = studentBillModule.RenewOrderModule(OrderId, guestId, orderModel,out string message);
return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
}
}
}
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