相亲 未登录查看

Mall.Module.Miai/MiaiModule.cs

@@ -557,18 +557,27 @@ namespace Mall.Module.Miai
             int WoManENum = miai_ActivityEnrollRepository.GetActivityEnrollNum(activityId, 1);
             int PeopleNum = ManENum + WoManENum;
             //获取当前用户是否已报名
-            bool IsEnroll = miai_ActivityEnrollRepository.GetList(new RB_Miai_ActivityEnroll_Extend() { TenantId = model.TenantId, ActivityId = activityId, UserId = userInfo.UserId }).Any();
+            bool IsEnroll = false;
+            if (userInfo.UserId > 0){
+                IsEnroll = miai_ActivityEnrollRepository.GetList(new RB_Miai_ActivityEnroll_Extend() { TenantId = model.TenantId, ActivityId = activityId, UserId = userInfo.UserId }).Any();
+            }
             //查询活动回复数量
             var rlist = miai_ActivityDiscussRepository.GetActivityReplyNumList(activityId.ToString());
             var umodel = CacheManager.User.UserReidsCache.GetAppletUserLoginInfo(model.UserId);
             //查询用户性别
             int Sex = miai_BaseInfoRepository.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = userInfo.TenantId, UserId = model.UserId }).FirstOrDefault()?.Sex ?? 0;
             //查询当前用户是否已关注
-            var myFollowList = miai_FollowMemberRepository.GetFollowMemberList(new RB_MiAi_FollowMember_Extend() { TenantId = userInfo.TenantId, UserId = model.UserId, CreateBy = userInfo.UserId });
-            bool IsFocus = myFollowList.Any();
-            var otherFollowList = miai_FollowMemberRepository.GetFollowMemberList(new RB_MiAi_FollowMember_Extend() { TenantId = userInfo.TenantId, UserId = userInfo.UserId, CreateBy = model.UserId });
-            //查询是否已关注我
-            bool IsFocus2 = otherFollowList.Any();
+            bool IsFocus = false, IsFocus2 = false;
+            List<RB_MiAi_FollowMember_Extend> myFollowList = new List<RB_MiAi_FollowMember_Extend>();
+            List<RB_MiAi_FollowMember_Extend> otherFollowList = new List<RB_MiAi_FollowMember_Extend>();
+            if (userInfo.UserId > 0)
+            {
+                myFollowList = miai_FollowMemberRepository.GetFollowMemberList(new RB_MiAi_FollowMember_Extend() { TenantId = userInfo.TenantId, UserId = model.UserId, CreateBy = userInfo.UserId });
+                IsFocus = myFollowList.Any();
+                otherFollowList = miai_FollowMemberRepository.GetFollowMemberList(new RB_MiAi_FollowMember_Extend() { TenantId = userInfo.TenantId, UserId = userInfo.UserId, CreateBy = model.UserId });
+                //查询是否已关注我
+                IsFocus2 = otherFollowList.Any();
+            }
             return new
             {
                 model.Id,
@@ -1084,7 +1093,7 @@ namespace Mall.Module.Miai
                         Type = Common.Enum.MiAi.MessageTypeEnum.SpellEnroll,
                         UserId = model.UserId,
                         SourceId = demodel.ActivityId,
-                        Content = "新用户报名拼拼plus",
+                        Content = "新用户报名拼拼Plus",
                         Status = 0,
                         TenantId = demodel.TenantId,
                         MallBaseId = demodel.MallBaseId,

Mall.Repository/Miai/RB_Miai_MessageRepository.cs

@@ -58,7 +58,7 @@ namespace Mall.Repository.Miai
                         where += $@" and Type in (3,4,5,6)";
                         break;
                     case 3:
-                        where += $@" and Type in (7)";
+                        where += $@" and Type in (7,10)";
                         break;
                     case 4:
                         where += $@" and Type in (8,9)";
@@ -183,7 +183,7 @@ namespace Mall.Repository.Miai
                         where += $@" and Type in (3,4,5,6)";
                         break;
                     case 3:
-                        where += $@" and Type in (7)";
+                        where += $@" and Type in (7,10)";
                         break;
                     case 4:
                         where += $@" and Type in (8,9)";
@@ -234,7 +234,7 @@ namespace Mall.Repository.Miai
                         where += $@" and Type in (3,4,5,6)";
                         break;
                     case 3:
-                        where += $@" and Type in (7)";
+                        where += $@" and Type in (7,10)";
                         break;
                     case 4:
                         where += $@" and Type in (8,9)";

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -17,6 +17,7 @@ using Mall.Model.Extend.Miai;
 using Mall.Model.Entity.Education;
 using Mall.Model.Extend.Education;
 using Mall.Module.User;
+using Microsoft.AspNetCore.Authorization;
 
 namespace Mall.WebApi.Controllers.MallBase
 {
@@ -42,14 +43,14 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetForumList()
         {
             var req = base.RequestParm;
-            var userInfo = AppletUserInfo;
             RB_Miai_Forum_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Forum_Extend>(req.msg.ToString());
 
-            demodel.TenantId = userInfo.TenantId;
-            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.TenantId = req.TenantId;
+            demodel.MallBaseId = req.MallBaseId;
             demodel.IsShow = 1;
             var list = miaiModule.GetForumList(demodel);
             return ApiResult.Success("", list.Select(x => new
@@ -68,18 +69,14 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetActivityPageList()
         {
             var parms = RequestParm;
-            var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
             RB_Miai_Activity_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Activity_Extend>(parms.msg.ToString());
-            //if (demodel.ForumId <= 0)
-            //{
-            //    return ApiResult.ParamIsNull("请传递版块id");
-            //}
-            demodel.TenantId = userInfo.TenantId;
-            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
             var list = miaiModule.GetActivityPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -116,6 +113,7 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetActivityInfo()
         {
             var userInfo = AppletUserInfo;
@@ -125,7 +123,14 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull();
             }
-
+            if (userInfo == null) {
+                userInfo = new AppletUserInfo
+                {
+                    UserId = 0,
+                    TenantId = RequestParm.TenantId,
+                    MallBaseId = RequestParm.MallBaseId
+                };
+            }
             var obj = miaiModule.GetActivityInfo(ActivityId, userInfo);
             return ApiResult.Success("", obj);
         }
@@ -270,15 +275,14 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult GetActivityDiscussPageList()
         {
             var parms = RequestParm;
-            var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
             RB_Miai_ActivityDiscuss_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityDiscuss_Extend>(parms.msg.ToString());
             if (demodel.ActivityId <= 0)
             {
                 return ApiResult.ParamIsNull("请传递活动id");
             }
-            demodel.TenantId = userInfo.TenantId;
-            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
             var list = miaiModule.GetActivityDiscussPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -315,17 +319,15 @@ namespace Mall.WebApi.Controllers.MallBase
         [HttpPost]
         public ApiResult GetActivityReplyPageList()
         {
-
             var parms = RequestParm;
-            var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
             RB_Miai_ActivityDiscuss_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_ActivityDiscuss_Extend>(parms.msg.ToString());
             if (demodel.ParentId <= 0)
             {
                 return ApiResult.ParamIsNull("请传递上级id");
             }
-            demodel.TenantId = userInfo.TenantId;
-            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
             var list = miaiModule.GetActivityReplyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -700,6 +702,8 @@ namespace Mall.WebApi.Controllers.MallBase
             pagelist.pageData = list.Select(x => new
             {
                 x.Id,
+                x.Type,
+                TypeName = x.Type.GetEnumName(),
                 UserId = demodel.VsisitorType == 1 ? x.CreateBy : x.UserId,
                 UserName = x.Name,
                 x.RealName,

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -339,6 +339,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取商会活动分页列表
         /// </summary>
         /// <returns></returns>
+        [AllowAnonymous]
         public ApiResult GetCommerceActivityPage()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -347,9 +348,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 ActivityType = jObj.GetInt("ActivityType")
             };
-            var userInfo = AppletUserInfo;
             query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = userInfo?.TenantId ?? 0;
+            query.TenantId = RequestParm.TenantId;
             var list = activityModule.GetCommerceActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
@@ -361,6 +361,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取商会活动详情
         /// </summary>
         /// <returns></returns>
+        [AllowAnonymous]
         public ApiResult GetCommerceActivity()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
@@ -370,14 +371,18 @@ 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)
-                {
-                    extModel.IsJoinActivity = 1;
-                }
-                else
+                extModel.IsJoinActivity = 0;
+                if (userInfo != null && userInfo.UserId > 0)
                 {
-                    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);