页面修改

Mall.Model/Extend/User/RB_Member_User_Extend.cs

@@ -216,6 +216,15 @@ namespace Mall.Model.Extend.User
             }
         }
 
+        /// <summary>
+        /// 用户所属分组
+        /// </summary>
+        public List<GroupItem> BelongGroupList { get; set; }
+
+        /// <summary>
+        /// 用户可查看分组
+        /// </summary>
+        public List<GroupItem> LookGroupList { get; set; }
     }
 
     /// <summary>

Mall.Module.Miai/MiaiModule.cs

@@ -101,10 +101,67 @@ namespace Mall.Module.Miai
         /// 获取用户信息
         /// </summary>
         /// <param name="userId"></param>
+        /// <param name="isGetGroup">是否查询分组</param>
         /// <returns></returns>
-        public Model.Extend.User.RB_Member_User_Extend GetMemberUserInfo(int userId)
+        public Model.Extend.User.RB_Member_User_Extend GetMemberUserInfo(int userId,bool isGetGroup=false)
         {
-            return member_UserRepository.GetEntity(userId).RefMapperTo<Model.Extend.User.RB_Member_User_Extend>();
+            var model= member_UserRepository.GetEntity(userId).RefMapperTo<Model.Extend.User.RB_Member_User_Extend>();
+            if (model != null && model.Id > 0&&isGetGroup)
+            {
+                model.BelongGroupList = new List<Model.Extend.User.GroupItem>();
+                model.LookGroupList = new List<Model.Extend.User.GroupItem>();
+                if (!string.IsNullOrEmpty(model.BelongGroupIds))
+                {
+                    var groupList = member_GroupRepository.GetMemberGroupListRepository(new Model.Extend.User.RB_Member_Group_Extend()
+                    {
+                        TenantId = model.TenantId,
+                        MallBaseId = model.MallBaseId
+                    });
+
+                    var b_group_ids = Common.ConvertHelper.StringToList(model.BelongGroupIds);
+                    if (b_group_ids != null && b_group_ids.Count > 0)
+                    {
+                        foreach (var sItem in b_group_ids)
+                        {
+                            var tempGroup = groupList?.FirstOrDefault(qitem => qitem.GroupId == sItem);
+                            if (tempGroup != null && tempGroup.GroupId > 0)
+                            {
+                                if (!(model.BelongGroupList.Where(qitem => qitem.GroupId == tempGroup.GroupId).Count() > 0))
+                                {
+                                    model.BelongGroupList.Add(new Model.Extend.User.GroupItem()
+                                    {
+                                        GroupId = tempGroup.GroupId,
+                                        GroupName = tempGroup.GroupName
+                                    });
+                                }
+                                if (!string.IsNullOrEmpty(tempGroup.LookGroupIds))
+                                {
+                                    var l_group_ids = Common.ConvertHelper.StringToList(tempGroup.LookGroupIds);
+                                    if (l_group_ids != null && l_group_ids.Count > 0)
+                                    {
+                                        foreach (var tItem in l_group_ids)
+                                        {
+                                            var l_Group = groupList?.FirstOrDefault(qitem => qitem.GroupId == tItem);
+                                            if (l_Group != null && l_Group.GroupId > 0)
+                                            {
+                                                if (!(model.LookGroupList.Where(qitem => qitem.GroupId == l_Group.GroupId).Count() > 0))
+                                                {
+                                                    model.LookGroupList.Add(new Model.Extend.User.GroupItem()
+                                                    {
+                                                        GroupId = l_Group.GroupId,
+                                                        GroupName = l_Group.GroupName
+                                                    });
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return model;
         }
         #endregion
 

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -2311,7 +2311,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 result.Add(new
                 {
                     item.Age,
-                    AlbumList= AlbumList,
+                    AlbumList,
                     Authentication = !string.IsNullOrWhiteSpace(item.IDCardNo)?1:0,
                     Education =item.EducationType.GetEnumName(),
                     item.Height,

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -655,7 +655,7 @@ namespace Mall.WebApi.Controllers.MallBase
             int userId = parm.GetInt("UserId");
             if (userId > 0)
             {
-                var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
+                var oldUserInfo = miaiModule.GetMemberUserInfo(userId, isGetGroup: true);
                 var oldBaseInfo = miaiModule.GetBaseInfoModel(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = UserInfo.TenantId, MallBaseId = UserInfo.MallBaseId });
                 if (oldBaseInfo != null && oldBaseInfo.Id > 0)
                 {
@@ -727,6 +727,10 @@ namespace Mall.WebApi.Controllers.MallBase
                         DWProvince = oldBaseInfo.DWProvince ?? 0,
                         DWCity = oldBaseInfo.DWCity ?? 0,
                         DWDistrict = oldBaseInfo.DWDistrict ?? 0,
+                        IsShow= oldUserInfo?.IsShow??0,
+                        LookTimes= oldUserInfo?.LookTimes??0,
+                        BelongGroupList= oldUserInfo?.BelongGroupList??new List<GroupItem> (),
+                        LookGroupList= oldUserInfo?.LookGroupList??new List<GroupItem> (),
                     };
                     return ApiResult.Success("", result);
                 }