Commit 3e757f09 authored by liudong1993's avatar liudong1993

订单调整

parent e5618a96
...@@ -97,6 +97,12 @@ namespace Edu.Model.ViewModel.Course ...@@ -97,6 +97,12 @@ namespace Edu.Model.ViewModel.Course
/// 查询可报名 1是 /// 查询可报名 1是
/// </summary> /// </summary>
public int Q_CanApply { get; set; } public int Q_CanApply { get; set; }
/// <summary>
/// 班级ids
/// </summary>
public string Q_ClassIds { get; set; }
/// 选中的周几/或日期数组 /// 选中的周几/或日期数组
/// </summary> /// </summary>
public List<string> WeekDayList { get; set; } public List<string> WeekDayList { get; set; }
......
...@@ -134,6 +134,16 @@ namespace Edu.Module.Course ...@@ -134,6 +134,16 @@ namespace Edu.Module.Course
return list; return list;
} }
/// <summary>
/// 获取班级名称
/// </summary>
/// <param name="classIds"></param>
/// <returns></returns>
public List<RB_Class_ViewModel> GetClassNameList(string classIds)
{
return classRepository.GetClassListRepository(new RB_Class_ViewModel() { Q_ClassIds = classIds });
}
/// <summary> /// <summary>
/// 日语培训下单 /// 日语培训下单
/// </summary> /// </summary>
...@@ -378,6 +388,10 @@ namespace Edu.Module.Course ...@@ -378,6 +388,10 @@ namespace Edu.Module.Course
{ {
var ordermodel = orderRepository.GetEntity(orderId); var ordermodel = orderRepository.GetEntity(orderId);
if (ordermodel == null) { return false; } if (ordermodel == null) { return false; }
if (ordermodel.EnterID != userInfo.Id)
{
return false;
}
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Order_ViewModel.EnterID),careOfPeople} { nameof(RB_Order_ViewModel.EnterID),careOfPeople}
}; };
...@@ -1101,7 +1115,7 @@ namespace Edu.Module.Course ...@@ -1101,7 +1115,7 @@ namespace Edu.Module.Course
else if (refund >= 0) else if (refund >= 0)
{ {
keyValues.Add(nameof(RB_Order_ViewModel.Refund), refund); keyValues.Add(nameof(RB_Order_ViewModel.Refund), refund);
LogContent = $",退款【{refund}】"; LogContent = $",更新退款【{refund}】";
} }
else { return false; } else { return false; }
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>() {
......
...@@ -45,6 +45,10 @@ WHERE 1=1 ...@@ -45,6 +45,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassId), query.ClassId); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassId), query.ClassId);
} }
if (!string.IsNullOrEmpty(query.Q_ClassIds))
{
builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_ViewModel.ClassId), query.Q_ClassIds);
}
} }
return Get<RB_Class_ViewModel>(builder.ToString()).ToList(); return Get<RB_Class_ViewModel>(builder.ToString()).ToList();
} }
......
...@@ -82,6 +82,28 @@ namespace Edu.WebApi.Controllers.Course ...@@ -82,6 +82,28 @@ namespace Edu.WebApi.Controllers.Course
return ApiResult.Success("", pageModel); return ApiResult.Success("", pageModel);
} }
/// <summary>
/// 获取班级名称
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetClassNameList()
{
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
string ClassIds = parms.GetStringValue("ClassIds");
if (string.IsNullOrEmpty(ClassIds)) {
return ApiResult.ParamIsNull("请传递班级ids");
}
var list = orderModule.GetClassNameList(ClassIds);
return ApiResult.Success("", list.Select(x => new
{
x.ClassId,
x.ClassName
}));
}
#endregion #endregion
#region 订单管理 #region 订单管理
...@@ -578,6 +600,18 @@ namespace Edu.WebApi.Controllers.Course ...@@ -578,6 +600,18 @@ namespace Edu.WebApi.Controllers.Course
[HttpPost] [HttpPost]
public ApiResult SetClassOrderCareOfClass() public ApiResult SetClassOrderCareOfClass()
{ {
var userInfo = base.UserInfo;
JObject parms = JObject.Parse(RequestParm.Msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
int ClassId = parms.GetInt("ClassId", 0);
if (OrderId <= 0) {
return ApiResult.ParamIsNull("请传递订单id");
}
if (ClassId <= 0) {
return ApiResult.ParamIsNull("请传递转入班级id");
}
return ApiResult.Success(); return ApiResult.Success();
} }
......
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