Skip to content

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

订单分拆、转班测试

parent 077837fc
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 8 deletions
Edu.Module.EduTask/OrderChangeModule.cs
View file @ 6561c47f
...@@ -270,25 +270,42 @@ namespace Edu.Module.EduTask ...@@ -270,25 +270,42 @@ namespace Edu.Module.EduTask
orderModel.UpdateBy = userInfo.Id; orderModel.UpdateBy = userInfo.Id;
orderModel.UpdateTime = DateTime.Now; orderModel.UpdateTime = DateTime.Now;
orderModel.OldGuestId = orderChangeModel.OrderGuestId; orderModel.OldGuestId = orderChangeModel.OrderGuestId;
if (oldOrderModel.SourceOrderId > 0) if (oldOrderModel.FirstOrderId ==0)
{ {
orderModel.FirstOrderId = oldOrderModel.SourceOrderId; orderModel.FirstOrderId = oldOrderModel.OrderId;
} }
else else
{ {
orderModel.FirstOrderId = oldOrderModel.OrderId; orderModel.FirstOrderId = oldOrderModel.FirstOrderId;
} }
flag = orderModule.SetClassOrderCommonModule(orderModel, userInfo, false, out string message); flag = orderModule.SetClassOrderCommonModule(orderModel, userInfo, false, out string message);
#endregion #endregion
if (flag) if (flag)
{ {
if (oldOrderModel.FirstOrderId > 0)
{
//添加关联记录
splitDetailsRepository.Insert(new RB_Order_SplitDetails()
{
OldOrderId = orderModel.FirstOrderId,
S_OrderId = oldOrderModel.OrderId,
S_JoinType = oldOrderModel.JoinType,
S_ClassId = oldOrderModel.ClassId,
T_OrderId = orderModel.OrderId,
T_JoinType = orderModel.JoinType,
T_ClassId = orderModel.ClassId,
CreateBy = orderModel.CreateBy,
CreateTime = DateTime.Now
});
}
#region 修改老订单 【目标订单和应收】 #region 修改老订单 【目标订单和应收】
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Order_ViewModel.TargetOrderId),orderModel.OrderId }, {nameof(RB_Order_ViewModel.TargetOrderId),orderModel.OrderId },
{nameof(RB_Order_ViewModel.PreferPrice),oldPreferPrice }, {nameof(RB_Order_ViewModel.PreferPrice),oldPreferPrice },
{nameof(RB_Order_ViewModel.TargetJoinType),(int) Common.Enum.Sale.OrderJoinTypeEnum.TransOrder }, {nameof(RB_Order_ViewModel.TargetJoinType),(int) Common.Enum.Sale.OrderJoinTypeEnum.TransOrder },
{nameof(RB_Order_ViewModel.FirstOrderId),orderModel.FirstOrderId },
}; };
flag = orderRepository.Update(fileds, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), orderChangeModel.SourceOrderId)); flag = orderRepository.Update(fileds, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), orderChangeModel.SourceOrderId));
#endregion #endregion
...@@ -703,13 +720,13 @@ namespace Edu.Module.EduTask ...@@ -703,13 +720,13 @@ namespace Edu.Module.EduTask
orderModel.OldGuestId = orderChangeModel.OrderGuestId; orderModel.OldGuestId = orderChangeModel.OrderGuestId;
orderModel.NewGuestTotalClassHours = Convert.ToInt32(courseValidHourse); orderModel.NewGuestTotalClassHours = Convert.ToInt32(courseValidHourse);
orderModel.SourceOrderId = orderChangeModel.SourceOrderId; orderModel.SourceOrderId = orderChangeModel.SourceOrderId;
if (oldOrderModel.TargetOrderId==0) if (oldOrderModel.FirstOrderId == 0)
{ {
orderModel.FirstOrderId = oldOrderModel.OrderId; orderModel.FirstOrderId = oldOrderModel.OrderId;
} }
else else
{ {
orderModel.FirstOrderId = oldOrderModel.SourceOrderId; orderModel.FirstOrderId = oldOrderModel.FirstOrderId;
} }
flag = orderModule.SetClassOrderCommonModule(orderModel, userInfo, false, out string message); flag = orderModule.SetClassOrderCommonModule(orderModel, userInfo, false, out string message);
#endregion #endregion
...@@ -736,6 +753,7 @@ namespace Edu.Module.EduTask ...@@ -736,6 +753,7 @@ namespace Edu.Module.EduTask
{nameof(RB_Order_ViewModel.TargetOrderId),orderModel.OrderId }, {nameof(RB_Order_ViewModel.TargetOrderId),orderModel.OrderId },
{nameof(RB_Order_ViewModel.PreferPrice),oldPreferPrice }, {nameof(RB_Order_ViewModel.PreferPrice),oldPreferPrice },
{nameof(RB_Order_ViewModel.TargetJoinType),(int) Common.Enum.Sale.OrderJoinTypeEnum.SplitOrder }, {nameof(RB_Order_ViewModel.TargetJoinType),(int) Common.Enum.Sale.OrderJoinTypeEnum.SplitOrder },
{nameof(RB_Order_ViewModel.FirstOrderId),orderModel.FirstOrderId},
}; };
flag = orderRepository.Update(fileds, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), orderChangeModel.SourceOrderId)); flag = orderRepository.Update(fileds, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), orderChangeModel.SourceOrderId));
#endregion #endregion
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 6561c47f
...@@ -239,7 +239,19 @@ namespace Edu.WebApi.Controllers.Course ...@@ -239,7 +239,19 @@ namespace Edu.WebApi.Controllers.Course
x.UpOrderId, x.UpOrderId,
x.VisitorReserveId, x.VisitorReserveId,
x.RenewOrderId, x.RenewOrderId,
x.SplitDetailsList, SplitDetailsList = x?.SplitDetailsList?.Select(qitem => new
{
qitem.S_ClassId,
qitem.S_ClassName,
qitem.S_JoinType,
S_JoinTypeName = qitem.S_JoinType.ToName(),
qitem.S_OrderId,
qitem.T_ClassId,
qitem.T_ClassName,
qitem.T_JoinType,
T_JoinTypeName = qitem.T_JoinType.ToName(),
qitem.T_OrderId
}),
SaleRemarkList = x.SaleRemarkList.Select(z => new SaleRemarkList = x.SaleRemarkList.Select(z => new
{ {
z.Id, z.Id,
...@@ -1265,7 +1277,19 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1265,7 +1277,19 @@ namespace Edu.WebApi.Controllers.Course
x.RenewOrderId, x.RenewOrderId,
x.FirstOrderId, x.FirstOrderId,
x.IsBackClass, x.IsBackClass,
x.SplitDetailsList, SplitDetailsList = x?.SplitDetailsList?.Select(qitem => new
{
qitem.S_ClassId,
qitem.S_ClassName,
qitem.S_JoinType,
S_JoinTypeName = qitem.S_JoinType.ToName(),
qitem.S_OrderId,
qitem.T_ClassId,
qitem.T_ClassName,
qitem.T_JoinType,
T_JoinTypeName = qitem.T_JoinType.ToName(),
qitem.T_OrderId
}),
SaleRemarkList = x?.SaleRemarkList.Select(z => new SaleRemarkList = x?.SaleRemarkList.Select(z => new
{ {
z.Id, z.Id,
...@@ -1428,7 +1452,19 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1428,7 +1452,19 @@ namespace Edu.WebApi.Controllers.Course
x.UpOrderId, x.UpOrderId,
x.VisitorReserveId, x.VisitorReserveId,
x.RenewOrderId, x.RenewOrderId,
x.SplitDetailsList, SplitDetailsList = x?.SplitDetailsList?.Select(qitem => new
{
qitem.S_ClassId,
qitem.S_ClassName,
qitem.S_JoinType,
S_JoinTypeName= qitem.S_JoinType.ToName(),
qitem.S_OrderId,
qitem.T_ClassId,
qitem.T_ClassName,
qitem.T_JoinType,
T_JoinTypeName = qitem.T_JoinType.ToName(),
qitem.T_OrderId
}),
SaleRemarkList = x?.SaleRemarkList.Select(z => new SaleRemarkList = x?.SaleRemarkList.Select(z => new
{ {
z.Id, z.Id,
......
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