Skip to content

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

页面修改

parent 5e939548
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 22 deletions
Edu.Module.EduTask/OrderChangeModule.cs
View file @ ab48fe18
...@@ -200,10 +200,10 @@ namespace Edu.Module.EduTask ...@@ -200,10 +200,10 @@ namespace Edu.Module.EduTask
if (orderChangeModel != null && orderChangeModel.Id > 0) if (orderChangeModel != null && orderChangeModel.Id > 0)
{ {
if (orderChangeModel.EffectiveDate < DateTime.Now) //if (orderChangeModel.EffectiveDate < DateTime.Now)
{ //{
return false; // return false;
} //}
var oldOrderModel = orderRepository.GetEntity(orderChangeModel.SourceOrderId); var oldOrderModel = orderRepository.GetEntity(orderChangeModel.SourceOrderId);
var classList = classRepository.GetClassListRepository(new RB_Class_ViewModel() var classList = classRepository.GetClassListRepository(new RB_Class_ViewModel()
{ {
...@@ -592,10 +592,17 @@ namespace Edu.Module.EduTask ...@@ -592,10 +592,17 @@ namespace Edu.Module.EduTask
/// </summary> /// </summary>
/// <param name="Id"></param> /// <param name="Id"></param>
/// <returns></returns> /// <returns></returns>
public bool TestUpdateOrderSplitModule(int Id) public bool TestUpdateOrderSplitModule(int Id,int Type)
{ {
var model = education_ReceiptRepository.GetEntity(Id); var model = education_ReceiptRepository.GetEntity(Id);
return UpdateOrderSplitModule(model); if (Type == 1)
{
return UpdateOrderChangeModule(model);
}
else
{
return UpdateOrderSplitModule(model);
}
} }
/// <summary> /// <summary>
...@@ -808,16 +815,13 @@ namespace Edu.Module.EduTask ...@@ -808,16 +815,13 @@ namespace Edu.Module.EduTask
#endregion #endregion
/// <summary> /// <summary>
/// 生成合同 /// 生成合同
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public bool CreateContract(RB_Order order, RB_Course course, RB_Education_Contract_ViewModel contractModel, int guestId) public bool CreateContract(RB_Order order, RB_Course course, RB_Education_Contract_ViewModel contractModel, int guestId)
{ {
bool flag = false; bool flag = false;
var guestModel = guestRepository.GetEntity(guestId); var guestModel = guestRepository.GetEntity(guestId);
var newModel = new RB_Education_Contract() var newModel = new RB_Education_Contract()
{ {
...@@ -897,7 +901,6 @@ namespace Edu.Module.EduTask ...@@ -897,7 +901,6 @@ namespace Edu.Module.EduTask
return flag; return flag;
} }
/// <summary> /// <summary>
/// 回归原班上课 /// 回归原班上课
/// </summary> /// </summary>
...@@ -907,13 +910,25 @@ namespace Edu.Module.EduTask ...@@ -907,13 +910,25 @@ namespace Edu.Module.EduTask
bool flag = false; bool flag = false;
var oldOrder = orderRepository.GetEntity(oldOrderId); var oldOrder = orderRepository.GetEntity(oldOrderId);
var order = orderRepository.GetEntity(OrderId); var order = orderRepository.GetEntity(OrderId);
var guest = guestRepository.GetEntity(GuestId);
var oldGuest = guestRepository.GetEntity(oldGuestId); var oldGuest = guestRepository.GetEntity(oldGuestId);
var guest = guestRepository.GetEntity(GuestId);
var classList = classRepository.GetClassListRepository(new RB_Class_ViewModel() var classList = classRepository.GetClassListRepository(new RB_Class_ViewModel()
{ {
Q_ClassIds = oldOrder.ClassId + "," + order.ClassId Q_ClassIds = oldOrder.ClassId + "," + order.ClassId
}); });
var oldContract = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel()
{
OrderId = oldOrder.OrderId,
GuestId = oldGuest.Id,
}).Where(qitem => qitem.Status == 0 || qitem.Status == 1 || qitem.Status == 2)?.FirstOrDefault();
var newContract = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel()
{
OrderId = order.OrderId,
GuestId = guest.Id,
}).Where(qitem => qitem.Status == 0 || qitem.Status == 1 || qitem.Status == 2)?.FirstOrDefault();
var oldClassModel = classList?.Where(qitem => qitem.ClassId == oldOrder.ClassId)?.FirstOrDefault() ?? new RB_Class_ViewModel(); var oldClassModel = classList?.Where(qitem => qitem.ClassId == oldOrder.ClassId)?.FirstOrDefault() ?? new RB_Class_ViewModel();
var newClassModel = classList?.Where(qitem => qitem.ClassId == order.ClassId)?.FirstOrDefault() ?? new RB_Class_ViewModel(); var newClassModel = classList?.Where(qitem => qitem.ClassId == order.ClassId)?.FirstOrDefault() ?? new RB_Class_ViewModel();
//原业务员 //原业务员
...@@ -923,22 +938,62 @@ namespace Edu.Module.EduTask ...@@ -923,22 +938,62 @@ namespace Edu.Module.EduTask
//生成收支相抵单据 //生成收支相抵单据
//剩余课时 //剩余课时
var surplus = guest.TotalHours - guest.CompleteHours; var surplus = guest.TotalHours - guest.CompleteHours;
var refundMoney = Math.Round(order.PreferPrice/ guest.TotalHours * surplus, 2);
#region 更新学员课时
//更新老订单学员课时 //更新老订单学员课时
Dictionary<string, object> oldGuestFileds = new Dictionary<string, object>() Dictionary<string, object> oldGuestFileds = new Dictionary<string, object>()
{ {
{nameof(RB_Order_Guest_Extend.TotalHours),oldGuest.TotalHours+surplus } {nameof(RB_Order_Guest_Extend.TotalHours),oldGuest.TotalHours+surplus }
}; };
flag= guestRepository.Update(oldGuestFileds, new WhereHelper(nameof(RB_Order_Guest_Extend.Id), GuestId)); flag= guestRepository.Update(oldGuestFileds, new WhereHelper(nameof(RB_Order_Guest_Extend.Id), oldGuest.Id));
//更新新订单学员课时
Dictionary<string, object> newGuestFileds = new Dictionary<string, object>() Dictionary<string, object> newGuestFileds = new Dictionary<string, object>()
{ {
{nameof(RB_Order_Guest_Extend.TotalHours),guest.CompleteHours } {nameof(RB_Order_Guest_Extend.TotalHours),guest.CompleteHours },
{nameof(RB_Order_Guest_Extend.GuestState),7 }
}; };
//更新新订单学员课时 flag = guestRepository.Update(newGuestFileds, new WhereHelper(nameof(RB_Order_Guest_Extend.Id), guest.Id));
flag= guestRepository.Update(newGuestFileds, new WhereHelper(nameof(RB_Order_Guest_Extend.Id), oldGuestId)); #endregion
var refundMoney = Math.Round(order.Unit_Price * surplus, 2); #region 更新订单应收
Dictionary<string, object> oldOrderFileds = new Dictionary<string, object>()
{
{nameof(RB_Order.PreferPrice),oldOrder.PreferPrice+refundMoney}
};
//更新原订单应收
flag = orderRepository.Update(oldOrderFileds, new WhereHelper(nameof(RB_Order.OrderId), oldOrder.OrderId));
Dictionary<string, object> newOrderFileds = new Dictionary<string, object>()
{
{nameof(RB_Order.PreferPrice),order.PreferPrice-refundMoney}
};
//更新新订单应收
flag = orderRepository.Update(newOrderFileds, new WhereHelper(nameof(RB_Order.OrderId), order.OrderId));
#endregion
#region 更新合同课时和应收
Dictionary<string, object> oldContractFileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Contract.FirstClassHours),guest.CompleteHours},
{nameof(RB_Education_Contract.FirstCourseFee),order.PreferPrice-refundMoney },
{nameof(RB_Education_Contract.FirstMoney),order.PreferPrice-refundMoney },
{nameof(RB_Education_Contract.Money), order.PreferPrice-refundMoney},
{nameof(RB_Education_Contract.CNYCaps), StringHelper.MoneyToUpper((order.PreferPrice-refundMoney).ToString()) }
};
flag = education_ContractRepository.Update(oldContractFileds, new WhereHelper(nameof(RB_Education_Contract.Id), oldContract.Id));
Dictionary<string, object> newContractFileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Contract.FirstClassHours), oldGuest.TotalHours+surplus},
{nameof(RB_Education_Contract.FirstCourseFee),oldOrder.PreferPrice+refundMoney },
{nameof(RB_Education_Contract.FirstMoney),oldOrder.PreferPrice+refundMoney },
{nameof(RB_Education_Contract.Money), oldOrder.PreferPrice+refundMoney},
{nameof(RB_Education_Contract.CNYCaps), StringHelper.MoneyToUpper((oldOrder.PreferPrice+refundMoney).ToString()) }
};
flag = education_ContractRepository.Update(newContractFileds, new WhereHelper(nameof(RB_Education_Contract.Id), newContract.Id));
#endregion
var outlay = new OrderChangeFinace() var outlay = new OrderChangeFinace()
{ {
ChangeType = 2, ChangeType = 2,
...@@ -972,9 +1027,7 @@ namespace Edu.Module.EduTask ...@@ -972,9 +1027,7 @@ namespace Edu.Module.EduTask
}; };
//生成收入财务单据 //生成收入财务单据
CreateInCome(income, out string msg); CreateInCome(income, out string msg);
} }
return flag; return flag;
} }
} }
......
Edu.WebApi/Controllers/EduTask/OrderChangeController.cs
View file @ ab48fe18
...@@ -190,7 +190,23 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -190,7 +190,23 @@ namespace Edu.WebApi.Controllers.EduTask
public ApiResult TestUpdateOrderSplit() public ApiResult TestUpdateOrderSplit()
{ {
var Id = base.ParmJObj.GetInt("Id"); var Id = base.ParmJObj.GetInt("Id");
bool flag = orderChangeModule.TestUpdateOrderSplitModule(Id); var Type = base.ParmJObj.GetInt("Type");
bool flag = orderChangeModule.TestUpdateOrderSplitModule(Id, Type);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 回归原班
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult RegressSourceClass()
{
var OrderId = base.ParmJObj.GetInt("OrderId");
var GuestId = base.ParmJObj.GetInt("GuestId");
var oldOrderId = base.ParmJObj.GetInt("oldOrderId");
var oldGuestId = base.ParmJObj.GetInt("oldGuestId");
bool flag = orderChangeModule.RegressSourceClassModule(OrderId, GuestId, oldOrderId, oldGuestId);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
} }
......
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