Skip to content

M
mall.oytour.com
Commit f7c83eec authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 40232d27
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 11 deletions
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @ f7c83eec
...@@ -2087,6 +2087,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -2087,6 +2087,7 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost] [HttpPost]
public ApiResult GetRollCallConsultList() public ApiResult GetRollCallConsultList()
{ {
var userInfo = AppletUserInfo;
JObject jObj = JObject.Parse(RequestParm.msg.ToString()); JObject jObj = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Education_Consult_Extend() var query = new RB_Education_Consult_Extend()
{ {
...@@ -2094,10 +2095,10 @@ namespace Mall.WebApi.Controllers.Education ...@@ -2094,10 +2095,10 @@ namespace Mall.WebApi.Controllers.Education
LinkMan = jObj.GetStringValue("LinkMan"), LinkMan = jObj.GetStringValue("LinkMan"),
EnrollState = jObj.GetInt("EnrollState", 0), EnrollState = jObj.GetInt("EnrollState", 0),
}; };
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = userInfo.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = userInfo.TenantId;
query.OrderStatus = 1; query.OrderStatus = 1;
query.IsCommission = 1; // query.IsCommission = 1;
var list = activityModule.GetRollCallConsultList(query); var list = activityModule.GetRollCallConsultList(query);
var result = list.Select(x => new var result = list.Select(x => new
{ {
...@@ -2121,21 +2122,19 @@ namespace Mall.WebApi.Controllers.Education ...@@ -2121,21 +2122,19 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost] [HttpPost]
public ApiResult GetUpdateRollCallConsultList() public ApiResult GetUpdateRollCallConsultList()
{ {
JObject jObj = JObject.Parse(RequestParm.msg.ToString()); var userInfo = AppletUserInfo;
List<RB_Education_Consult_Extend> newList = JsonConvert.DeserializeObject<List<RB_Education_Consult_Extend>>(RequestParm.msg.ToString()); List<RB_Education_Consult_Extend> newList = JsonConvert.DeserializeObject<List<RB_Education_Consult_Extend>>(RequestParm.msg.ToString());
if (newList == null || !newList.Any()) if (newList == null || !newList.Any())
{ {
return ApiResult.Failed("订单已全部提成/暂无报入订单"); return ApiResult.Failed("订单已全部提成/暂无报入订单");
} }
var query = new RB_Education_Consult_Extend() var query = new RB_Education_Consult_Extend();
{ query.EnrollState = 0;
EnrollState = jObj.GetInt("EnrollState", 0),
};
query.ActivityId = newList.FirstOrDefault()?.ActivityId ?? 0; query.ActivityId = newList.FirstOrDefault()?.ActivityId ?? 0;
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = userInfo.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = userInfo.TenantId;
query.OrderStatus = 1; query.OrderStatus = 1;
query.IsCommission = 1; // query.IsCommission = 1;
var list = new List<RB_Education_Consult_Extend>(); var list = new List<RB_Education_Consult_Extend>();
if (query.ActivityId > 0) if (query.ActivityId > 0)
{ {
......
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