Commit f2bf0795 authored by 吴春's avatar 吴春

1

parent f467763b
......@@ -37,10 +37,6 @@ namespace Edu.Model.Entity.Sell
/// </summary>
public decimal Unit_Price { get; set; }
/// <summary>
/// 价格类型,1-基础价格,2-课时价格 2024-08-26 add by:w
/// </summary>
public int SellPriceType { get; set; }
/// <summary>
/// 教材费 2024-08-26 add by:w
......@@ -55,7 +51,7 @@ namespace Edu.Model.Entity.Sell
/// <summary>
/// 总课时 2024-08-26 add by:W
/// </summary>
public int TotalClassHours { get; set; }
public decimal TotalClassHours { get; set; }
/// <summary>
/// 客人数量
......
......@@ -551,6 +551,9 @@ namespace Edu.WebApi.Controllers.Course
SaleRemark = base.ParmJObj.GetStringValue("SaleRemark"),
SourceId = base.ParmJObj.GetInt("SourceId"),
Unit_Price = base.ParmJObj.GetDecimal("Unit_Price"),
TotalClassHours = base.ParmJObj.GetDecimal("TotalClassHours"),
TextbookFee = base.ParmJObj.GetDecimal("TextbookFee"),
CoursewareFee = base.ParmJObj.GetDecimal("CoursewareFee"),
HelpEnterId = base.ParmJObj.GetInt("HelpEnterId"),
GeneralOccupation = base.ParmJObj.GetStringValue("GeneralOccupation"),
EduOccupation = base.ParmJObj.GetStringValue("EduOccupation"),
......@@ -676,7 +679,8 @@ namespace Edu.WebApi.Controllers.Course
{
var userInfo = base.UserInfo;
var OrderListStr = base.ParmJObj.GetStringValue("OrderList");
if (string.IsNullOrEmpty(OrderListStr)) {
if (string.IsNullOrEmpty(OrderListStr))
{
return ApiResult.ParamIsNull("请传递表单数据");
}
List<object> OrderObjList = JsonHelper.DeserializeObject<List<object>>(OrderListStr);
......@@ -794,13 +798,15 @@ namespace Edu.WebApi.Controllers.Course
}
}
}
else {
else
{
return ApiResult.Failed("只能课程订单批量操作");
}
deList.Add(demodel);
}
if (!deList.Any()) {
if (!deList.Any())
{
return ApiResult.Failed("请传递订单信息");
}
var flag = orderModule.SetClassOrderModuleBatch(deList, userInfo, base.CheckUserActionAuth("Edit_Order"), out string message);
......@@ -1155,7 +1161,7 @@ namespace Edu.WebApi.Controllers.Course
}));
}
/// <summary>
/// 获取枚举列表
......@@ -2662,6 +2668,6 @@ namespace Edu.WebApi.Controllers.Course
}
#endregion
}
}
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