Commit e621f0ad authored by 吴春's avatar 吴春

提交代码

parent 1f9969ea
......@@ -2034,7 +2034,9 @@ namespace Mall.WebApi.Controllers.Education
JObject jObj = JObject.Parse(RequestParm.msg.ToString());
var query = new RB_Education_Activity_Extend()
{
ActivityName = jObj.GetStringValue("ActivityName")
ActivityName = jObj.GetStringValue("ActivityName"),
SelectStartTimeStr= jObj.GetStringValue("SelectStartTimeStr"),
SelectEndTimeStr = jObj.GetStringValue("SelectEndTimeStr"),
};
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
......@@ -2195,6 +2197,7 @@ namespace Mall.WebApi.Controllers.Education
query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId;
query.OrderStatus = 1;
// query.EnrollState = 3;
var list = activityModule.GetCommerceConsultListRepository_V2(query);
var result = list.Select(x => new
......@@ -2432,7 +2435,7 @@ namespace Mall.WebApi.Controllers.Education
FinicePayList = recultFiniceList.Where(t => t.Type == WFTempLateClassEnum.OUT && t.ReFinanceId2 > 0),//活动报名支出
OtherFiniceReciveList = recultFiniceList.Where(t => t.Type == WFTempLateClassEnum.IN && t.ReFinanceId2 <= 0),//其他收入
OtherFinicePayList = recultFiniceList.Where(t => t.Type == WFTempLateClassEnum.OUT && t.ReFinanceId2 <= 0),//其他支出
};
return ApiResult.Success("", resultData);
}
......
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