Commit 4a12898d authored by 黄奎's avatar 黄奎

页面修改

parent 4b1246d4
......@@ -20,6 +20,11 @@ namespace Edu.Model.Entity.EduTask
/// </summary>
public int SourceOrderId { get; set; }
/// <summary>
/// 学员编号
/// </summary>
public int OrderGuestId { get; set; }
/// <summary>
/// 变更类型(1-转班,2-分拆)
/// </summary>
......@@ -74,5 +79,7 @@ namespace Edu.Model.Entity.EduTask
/// 更新时间
/// </summary>
public DateTime UpdateTime { get; set; }
}
}
......@@ -7,6 +7,7 @@
<ItemGroup>
<ProjectReference Include="..\Edu.Aop\Edu.Aop.csproj" />
<ProjectReference Include="..\Edu.Cache\Edu.Cache.csproj" />
<ProjectReference Include="..\Edu.Module.Course\Edu.Module.Course.csproj" />
<ProjectReference Include="..\Edu.Repository\Edu.Repository.csproj" />
</ItemGroup>
......
using Edu.AOP.CustomerAttribute;
using Edu.Model.Entity.EduTask;
using Edu.Model.ViewModel.EduTask;
using Edu.Module.Course;
using Edu.Repository.Course;
using Edu.Repository.EduTask;
using System;
using System.Collections.Generic;
......@@ -8,6 +10,9 @@ using System.Text;
namespace Edu.Module.EduTask
{
/// <summary>
/// 订单转班、分拆处理类
/// </summary>
public class OrderChangeModule
{
/// <summary>
......@@ -20,6 +25,26 @@ namespace Edu.Module.EduTask
/// </summary>
private readonly RB_Education_ReceiptRepository education_ReceiptRepository = new RB_Education_ReceiptRepository();
/// <summary>
/// 订单仓储层对象
/// </summary>
private readonly RB_OrderRepository orderRepository = new RB_OrderRepository();
/// <summary>
/// 班级仓储层对象
/// </summary>
private readonly RB_ClassRepository classRepository = new RB_ClassRepository();
/// <summary>
/// 课程仓储层对象
/// </summary>
private readonly RB_CourseRepository courseRepository = new RB_CourseRepository();
/// <summary>
/// 订单处理类对象
/// </summary>
private readonly OrderModule orderModule = new OrderModule();
/// <summary>
/// 新增订单转班、分拆
/// </summary>
......@@ -38,7 +63,7 @@ namespace Edu.Module.EduTask
var educationReceipt = new RB_Education_Receipt()
{
Id = 0,
Title = "转班申请",
Title = "订单转班申请",
ReceiptType = Common.Enum.Finance.ReceiptTypeEnum.OrderTransClass,
RelationId = newId,
OrderId = model.SourceOrderId,
......@@ -55,5 +80,27 @@ namespace Edu.Module.EduTask
}
return flag;
}
/// <summary>
/// 订单转班处理类方法
/// </summary>
/// <returns></returns>
public bool UpdateOrderChangeModule(RB_Education_Receipt receiptModel)
{
bool flag = false;
if (receiptModel.RelationId > 0)
{
var orderChangeModel = order_ChangeRepository.GetEntity<RB_Order_Change_ViewModel>(receiptModel.RelationId);
if (orderChangeModel != null && orderChangeModel.Id > 0)
{
var oldOrderModel = orderRepository.GetEntity(orderChangeModel.SourceOrderId);
var newClassModel = classRepository.GetEntity(orderChangeModel.NewClassId);
var newCourseModel = courseRepository.GetEntity(orderChangeModel.NewCourseId);
//orderModule.SetClassOrderCareOfClass
}
}
return flag;
}
}
}
......@@ -42,5 +42,7 @@ WHERE 1=1
}
return Get<RB_Order_Change_ViewModel>(builder.ToString()).ToList();
}
}
}
using Edu.Common.API;
using Edu.Common.Plugin;
using Edu.Model.ViewModel.EduTask;
using Edu.Module.Course;
using Edu.Module.EduTask;
using Edu.WebApi.Filter;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
using System;
namespace Edu.WebApi.Controllers.EduTask
{
/// <summary>
/// 订单转班、分拆控制器
/// </summary>
[Route("api/[controller]/[action]")]
[ApiExceptionFilter]
[ApiController]
[EnableCors("AllowCors")]
public class OrderChangeController : BaseController
{
/// <summary>
/// 订单转班、分拆处理类对象
/// </summary>
private readonly OrderChangeModule orderChangeModule = AOP.AOPHelper.CreateAOPObject<OrderChangeModule>();
/// <summary>
/// 班级处理类对象
/// </summary>
private readonly ClassModule classModule = AOP.AOPHelper.CreateAOPObject<ClassModule>();
/// <summary>
/// 新增订单转班申请
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderChange()
{
var model = new RB_Order_Change_ViewModel()
{
Id = base.ParmJObj.GetInt("Id"),
SourceOrderId = base.ParmJObj.GetInt("SourceOrderId"),
ChangeType = base.ParmJObj.GetInt("ChangeType"),
NewClassId = base.ParmJObj.GetInt("NewClassId"),
NewCourseId = base.ParmJObj.GetInt("NewCourseId"),
EffectiveDate = base.ParmJObj.GetDateTime("EffectiveDate"),
Remarks = base.ParmJObj.GetStringValue("Remarks"),
OrderGuestId=base.ParmJObj.GetInt("OrderGuestId"),
};
var classModel = classModule.GetClassModule(model.NewClassId );
model.CreateBy = base.UserInfo.Id;
model.CreateTime = DateTime.Now;
model.Group_Id = base.UserInfo.Group_Id;
model.School_Id = classModel.School_Id;
model.UpdateBy = base.UserInfo.Id;
model.UpdateTime = DateTime.Now;
bool flag = orderChangeModule.SetOrderChangeModule(model, 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