Commit 9b64eb34 authored by 吴春's avatar 吴春

提交代码

parent 46a72eb7
......@@ -15,6 +15,7 @@ using Newtonsoft.Json.Linq;
using Mall.Common.Plugin;
using Google.Protobuf.WellKnownTypes;
using Mall.Model.Entity.Education;
using Microsoft.AspNetCore.Authorization;
namespace Mall.WebApi.Controllers.Education
{
......@@ -634,6 +635,7 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
public ApiResult GetMiAiDynamicList(object requestMsg)
{
......
......@@ -878,7 +878,7 @@ namespace Mall.WebApi.Controllers.MallBase
}
}
[AllowAnonymous]
[HttpPost]
public ApiResult GetMiAiBaseIfo()
{
......@@ -891,10 +891,10 @@ namespace Mall.WebApi.Controllers.MallBase
int MyFollowId = 0;
int OtherFollowId = 0;
if (userInfo!=null)
{
var oldList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userId, CreateBy = userInfo.UserId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
var oldOtherList = miaiModule.GetFollowMemberList(new RB_MiAi_FollowMember_Extend { Status = 0, UserId = userInfo.UserId, CreateBy = userId, MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
var oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
if (userId != userInfo.UserId)
{
......@@ -928,14 +928,18 @@ namespace Mall.WebApi.Controllers.MallBase
SourceId = userId,
Content = "用户访问了您的自画像",
Status = 0,
TenantId = oldUserInfo.TenantId,
MallBaseId = oldUserInfo.MallBaseId,
TenantId = RequestParm.TenantId,
MallBaseId = RequestParm.MallBaseId,
CreateBy = userInfo.UserId,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now
});
}
}
var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
var oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = RequestParm.TenantId, MallBaseId = RequestParm.MallBaseId }).FirstOrDefault();
......@@ -1308,7 +1312,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.Failed("动态id不为空");
}
Rb_Education_Dynamic_Extend articele = dynamicModule.GetDynamicDetial(new Rb_Education_Dynamic_Extend { UserId = userInfo.UserId, Id = articleId });
Rb_Education_Dynamic_Extend articele = dynamicModule.GetMiAiDynamicDetial(new Rb_Education_Dynamic_Extend { UserId = userInfo.UserId, Id = articleId });
if (articele != null)
{
var data = DecoratorDynameicResult(articele);
......
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