Commit a5c7bfbd authored by 黄奎's avatar 黄奎

页面修改

parent 0836e93e
......@@ -325,6 +325,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取商会活动类型列表
/// </summary>
/// <returns></returns>
[AllowAnonymous]
public ApiResult GetCommerceActivityTypeList()
{
var query = new RB_Commerce_ActivityType_Extend();
......@@ -339,6 +340,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取商会活动分页列表
/// </summary>
/// <returns></returns>
[AllowAnonymous]
public ApiResult GetCommerceActivityPage()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
......@@ -361,6 +363,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取商会活动详情
/// </summary>
/// <returns></returns>
[AllowAnonymous]
public ApiResult GetCommerceActivity()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
......@@ -370,14 +373,17 @@ namespace Mall.WebApi.Controllers.TradePavilion
if (extModel != null && extModel.CreateBy > 0)
{
extModel.CreateByName = UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.Name ?? "";
var list = consultModule.GetCommerceConsultListModule(new RB_Commerce_Consult_Extend() { ActivityId = Id, UserId = userInfo.UserId });
if (list != null && list.Count > 0)
if (userInfo != null && userInfo.UserId > 0)
{
extModel.IsJoinActivity = 1;
}
else
{
extModel.IsJoinActivity = 0;
var list = consultModule.GetCommerceConsultListModule(new RB_Commerce_Consult_Extend() { ActivityId = Id, UserId = userInfo.UserId });
if (list != null && list.Count > 0)
{
extModel.IsJoinActivity = 1;
}
else
{
extModel.IsJoinActivity = 0;
}
}
}
return ApiResult.Success(data: extModel);
......
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