提交代码

Mall.Module.Miai/MiaiModule.cs

@@ -31,6 +31,24 @@ namespace Mall.Module.Miai
 
         private readonly RB_MiAi_FollowMemberRepository miai_FollowMemberRepository = new RB_MiAi_FollowMemberRepository();
 
+        /// <summary>
+        /// 用户管理
+        /// </summary>
+        private readonly Repository.User.RB_Member_UserRepository member_UserRepository = new Repository.User.RB_Member_UserRepository();
+
+        #region 会员信息
+        /// <summary>
+        /// 获取用户信息
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public Model.Extend.User.RB_Member_User_Extend GetMemberUserInfo(int userId)
+        {
+            return member_UserRepository.GetEntity(userId).RefMapperTo<Model.Extend.User.RB_Member_User_Extend>();
+        }
+        #endregion
+
+
         #region 活动版块
         /// <summary>
         /// 获取活动版本分页列表

Mall.Repository/Miai/RB_MiAi_FollowMemberRepository.cs

@@ -76,7 +76,7 @@ namespace Mall.Repository.Miai
         public List<RB_MiAi_FollowMember_Extend> GetFollowMemberPageList(int pageIndex, int pageSize, out long rowsCount, RB_MiAi_FollowMember_Extend where)
         {
             StringBuilder sb = new StringBuilder();
-            sb.Append($@"SELECT a.*,b.`Name`,b.Photo from RB_MiAi_FollowMember  as a LEFT JOIN rb_member_user as b on a.createby=b.Id  where a.`Status`=0");
+            sb.Append($@"SELECT a.*,b.`Name`,b.Photo from RB_MiAi_FollowMember  as a LEFT JOIN rb_member_user as b on a.UserId=b.Id  where a.`Status`=0");
             if (where != null)
             {
                 if (where.TenantId > 0)

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -91,7 +91,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.ReplyNum,
                 x.EnrollNum,
                 x.IsOpenEnroll,
-                Deadline =x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") :"",
+                Deadline = x.IsOpenEnroll == 1 ? x.Deadline.Value.ToString("yyyy-MM-dd HH:mm") : "",
                 CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
             });
             return ApiResult.Success("", pagelist);
@@ -342,7 +342,7 @@ namespace Mall.WebApi.Controllers.MallBase
             #region 内容是否违规
             try
             {
-                var miniModel = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });                
+                var miniModel = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
                 int violationNum = programMsgModule.CheckViolation(miniModel, demodel.Content);
                 if (violationNum == 0)
                 {
@@ -689,29 +689,47 @@ namespace Mall.WebApi.Controllers.MallBase
                     isFollow = 0;
                 }
             }
+
+            var oldUserInfo = miaiModule.GetMemberUserInfo(userId);
             var oldBaseInfo = miaiModule.GetBaseInfoList(new RB_MiAi_BaseInfo_Extend { UserId = userId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }).FirstOrDefault();
-            if (oldBaseInfo != null && oldBaseInfo.Id > 0)
+
+
+            if (oldUserInfo != null && oldUserInfo.Id > 0)
             {
-                oldBaseInfo.AlbumList = new List<string>();
-                if (!string.IsNullOrWhiteSpace(oldBaseInfo.Album))
+                int IsAttestation = 0;
+                if (oldBaseInfo != null && oldBaseInfo.Id > 0)
+                {
+                    oldBaseInfo.AlbumList = new List<string>();
+                    if (!string.IsNullOrWhiteSpace(oldBaseInfo.Album))
+                    {
+                        oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
+                    }
+                    IsAttestation = 1;//已认证
+                }
+                else
                 {
-                    oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
+                    oldBaseInfo = new RB_MiAi_BaseInfo_Extend();
                 }
+
                 var result = new
                 {
+                    oldBaseInfo.Id,
+                    oldBaseInfo.Name,
+                    oldBaseInfo.Photo,
+                    IsAttestation,
                     IsFollow = isFollow,
-                    oldBaseInfo.Sex,
-                    oldBaseInfo.IDCardNo,
-                    oldBaseInfo.RealName,
-                    oldBaseInfo.IDCard,
-                    oldBaseInfo.IDCardBack,
-                    SexStr = oldBaseInfo.Sex == 1 ? "男" : "女",
+                    oldBaseInfo?.Sex,
+                    oldBaseInfo?.IDCardNo,
+                    oldBaseInfo?.RealName,
+                    oldBaseInfo?.IDCard,
+                    oldBaseInfo?.IDCardBack,
+                    SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
                     oldBaseInfo.Birthday,
                     Age = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAge(oldBaseInfo.Birthday),//年纪
                     ShenXiao = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetShengXiao(Convert.ToDateTime((oldBaseInfo.Birthday))),//生肖
                     ConoldBaseInfostellation = string.IsNullOrWhiteSpace(oldBaseInfo.Birthday) ? "" : StringHelper.GetAtomFromBirthday(Convert.ToDateTime((oldBaseInfo.Birthday))),//星座
-                    oldBaseInfo.Height,
-                    oldBaseInfo.Weight,
+                    oldBaseInfo?.Height,
+                    oldBaseInfo?.Weight,
                     Marriage = (oldBaseInfo.Marriage.HasValue && oldBaseInfo.Marriage.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.Marriage) : "",
                     EducationType = (oldBaseInfo.EducationType.HasValue && oldBaseInfo.EducationType.Value > 0) ? EnumHelper.GetEnumName(oldBaseInfo.EducationType) : "",
                     YearMoney = oldBaseInfo.YearMoney ?? "",
@@ -733,7 +751,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             else
             {
-                return ApiResult.Failed("用户暂未认证");
+                return ApiResult.Failed("用户信息不存在");
             }
         }
 
@@ -978,6 +996,6 @@ namespace Mall.WebApi.Controllers.MallBase
         }
         #endregion
 
-     
+
     }
 }
\ No newline at end of file