提交代码

Mall.WebApi/Controllers/Education/AppletSchoolController.cs

@@ -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)
         {

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -878,7 +878,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
 
-
+        [AllowAnonymous]
         [HttpPost]
         public ApiResult GetMiAiBaseIfo()
         {
@@ -891,53 +891,57 @@ namespace Mall.WebApi.Controllers.MallBase
             int MyFollowId = 0;
             int OtherFollowId = 0;
 
-            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)
+            if (userInfo!=null)
             {
-                if (oldList != null && oldList.Any() && oldOtherList != null && oldOtherList.Any())
-                {
-                    isFollow = 3;
-                    MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
-                    OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
-                }
-                else if (oldList != null && oldList.Any())
-                {
-                    isFollow = 1;
-                    MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
-                }
-                else if (oldOtherList != null && oldOtherList.Any())
-                {
-                    isFollow = 2;
-                    OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
-                }
-                else
-                {
-                    isFollow = 0;
-                }
+                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 });
 
-                //设置消息推送
-                miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
+                if (userId != userInfo.UserId)
                 {
-                    Id = 0,
-                    Type = Common.Enum.MiAi.MessageTypeEnum.Look,
-                    UserId = userId,
-                    SourceId = userId,
-                    Content = "用户访问了您的自画像",
-                    Status = 0,
-                    TenantId = oldUserInfo.TenantId,
-                    MallBaseId = oldUserInfo.MallBaseId,
-                    CreateBy = userInfo.UserId,
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now
-                });
+                    if (oldList != null && oldList.Any() && oldOtherList != null && oldOtherList.Any())
+                    {
+                        isFollow = 3;
+                        MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
+                        OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
+                    }
+                    else if (oldList != null && oldList.Any())
+                    {
+                        isFollow = 1;
+                        MyFollowId = oldList.FirstOrDefault()?.ID ?? 0;
+                    }
+                    else if (oldOtherList != null && oldOtherList.Any())
+                    {
+                        isFollow = 2;
+                        OtherFollowId = oldOtherList.FirstOrDefault()?.ID ?? 0;
+                    }
+                    else
+                    {
+                        isFollow = 0;
+                    }
 
-            }
+                    //设置消息推送
+                    miaiCommonModule.SetMessage(new RB_Miai_Message_Extend()
+                    {
+                        Id = 0,
+                        Type = Common.Enum.MiAi.MessageTypeEnum.Look,
+                        UserId = userId,
+                        SourceId = userId,
+                        Content = "用户访问了您的自画像",
+                        Status = 0,
+                        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();
 
+         
 
             if (oldUserInfo != null && oldUserInfo.Id > 0)
             {
@@ -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);