提交代码

Mall.Module.User/UserModule.cs

@@ -21,6 +21,7 @@ using System.Threading;
 using Mall.Repository.Finance;
 using NPOI.SS.Formula.Functions;
 using VT.FW.DB;
+using Mall.Repository.Miai;
 
 namespace Mall.Module.User
 {
@@ -197,6 +198,10 @@ namespace Mall.Module.User
         /// </summary>
         private readonly Repository.Education.RB_Education_TeacherRepository educationTeacherRepository = new Repository.Education.RB_Education_TeacherRepository();
 
+        private readonly RB_MiAi_BaseInfoRepository miai_BaseInfoRepository = new RB_MiAi_BaseInfoRepository();
+
+
+        private readonly RB_MiAi_FollowMemberRepository miai_FollowMemberRepository = new RB_MiAi_FollowMemberRepository();
 
         #region 基础配置
 
@@ -261,12 +266,12 @@ namespace Mall.Module.User
             return member_UserRepository.GetMemberUserDropDownList_V2(pageIndex, pageSize, out count, dmodel);
         }
 
-            /// <summary>
-            /// 获取用户信息
-            /// </summary>
-            /// <param name="userId"></param>
-            /// <returns></returns>
-            public RB_Member_User_Extend GetMemberUserInfo(int userId)
+        /// <summary>
+        /// 获取用户信息
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public RB_Member_User_Extend GetMemberUserInfo(int userId)
         {
             return member_UserRepository.GetEntity(userId).RefMapperTo<RB_Member_User_Extend>();
         }
@@ -439,7 +444,8 @@ namespace Mall.Module.User
                 }
             };
             bool flag = member_UserRepository.Update(files, wheres);
-            if (flag) {
+            if (flag)
+            {
                 //清除黑名单缓存
                 var userInfo = new AppletUserInfo
                 {
@@ -4045,18 +4051,22 @@ namespace Mall.Module.User
         {
             var umodel = member_UserRepository.GetEntity(userId1);
             var mymodel = member_UserRepository.GetEntity(userId2);
-            if (umodel == null) {
+            if (umodel == null)
+            {
                 return ApiResult.ParamIsNull("当前用户不存在");
             }
-            if (mymodel == null) {
+            if (mymodel == null)
+            {
                 return ApiResult.ParamIsNull("用户不存在");
             }
             string userIds = member_UserRepository.GetMyUserHierarchicalRelationList(userId1, userId2);
             List<object> RList = new List<object>();
-            if (!string.IsNullOrEmpty(userIds)) {
+            if (!string.IsNullOrEmpty(userIds))
+            {
                 var list = member_UserRepository.GetList(new RB_Member_User_Extend() { UserIds = userIds });
                 int pId = userId1;
-                for (var i = 1; i <= list.Count(); i++) {
+                for (var i = 1; i <= list.Count(); i++)
+                {
                     var member = list.Where(x => x.Id == pId).FirstOrDefault();
                     if (member != null)
                     {
@@ -4073,7 +4083,8 @@ namespace Mall.Module.User
                         });
                         pId = member.SuperiorId ?? 0;
                     }
-                    else {
+                    else
+                    {
                         break;
                     }
                 }
@@ -4492,7 +4503,7 @@ namespace Mall.Module.User
         /// <param name="tenantId"></param>
         /// <param name="mallBaseId"></param>
         /// <returns></returns>
-        public object GetAppletUserCenterStatistics(string openId, RB_MiniProgram_Extend miniConfig=null)
+        public object GetAppletUserCenterStatistics(string openId, RB_MiniProgram_Extend miniConfig = null)
         {
             var objData = new object();
             var umodel = member_UserRepository.GetMemberUserEntityRepository(new RB_Member_User_Extend() { OpenId = openId });
@@ -4557,9 +4568,9 @@ namespace Mall.Module.User
                 var couponList = memberCouponRepository.GetAllMemberCouponPageList(new RB_Member_DiscountCoupon_Extend { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, UseState = 0, UserId = umodel.Id });
 
                 var MemberGrade = "普通用户";
-                
+
                 string MemberGradeIcon = "";
-                
+
                 if (umodel.MemberGrade > 0)
                 {
                     var mgModel = member_GradeRepository.GetEntity(umodel.MemberGrade);
@@ -4579,6 +4590,15 @@ namespace Mall.Module.User
                 //会员等级是否可购买
                 bool IsMemberBuy = member_GradeRepository.GetList(new RB_Member_Grade_Extend() { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, IsMemberBuy = 1, Enabled = 1 }).Any();
 
+                //2021-02-25 add by :w
+                var oldBaseInfo = miai_BaseInfoRepository.GetBaseInfoList(new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend { UserId = umodel.Id, TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId }).FirstOrDefault();
+
+
+                //var oldFollowList = miai_FollowMemberRepository.GetFollowMemberList(new Model.Extend.Miai.RB_MiAi_FollowMember_Extend { Status =0, UserId = umodel.Id,  MallBaseId = umodel.MallBaseId, TenantId = umodel.TenantId });//我的粉丝
+                var myFollowList = miai_FollowMemberRepository.GetFollowMemberList(new Model.Extend.Miai.RB_MiAi_FollowMember_Extend { Status = 0, CreateBy = umodel.Id, MallBaseId = umodel.MallBaseId, TenantId = umodel.TenantId });//我的关注
+
+
+
                 objData = new
                 {
                     //昵称
@@ -4629,7 +4649,12 @@ namespace Mall.Module.User
                         GuideCarWaitCommentNum,
                         Completed = olist.Where(x => x.OrderClassify == 1 && x.OrderStatus == Common.Enum.Goods.OrderStatusEnum.Received).FirstOrDefault()?.OrderNum ?? 0,
                     },
-                    isShowDistributionCenter = IsShowDistributionCenter
+                    isShowDistributionCenter = IsShowDistributionCenter,
+                    isAttestation = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? 1 : 0,// 0-未认证，1-已认证
+                    Sex = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.Sex : 0,//0-未认证，1-男-2女
+                    myFollowNum = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.FollowNum : 0,//关注我的
+                    followNum = (myFollowList != null && myFollowList.Any()) ? myFollowList.Count : 0,//我的关注
+
                 };
             }
             return objData;
@@ -6501,7 +6526,7 @@ namespace Mall.Module.User
             if (model.Id == 0)
             {
                 bool result = smallShopsInfoRepository.Insert(model) > 0;
-                if (memberModel.SmallShopId > 0&& result)
+                if (memberModel.SmallShopId > 0 && result)
                 {
                     IDictionary<string, object> fileds = new Dictionary<string, object>()
                         {

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -930,5 +930,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
         #endregion
+
+     
     }
 }
\ No newline at end of file