1

gx_api/GxPress/Api/GxPress.Api/AppControllers/GroupController.cs

@@ -230,7 +230,7 @@ namespace GxPress.Api.AppControllers
         [HttpGet("category-list/{categoryId}")]
         public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId)
         {
-            return await _groupService.GetAllAsync(categoryId);
+            return await _groupService.GetAllAsync(categoryId, _loginContext.AccountId);
         }
         /// <summary>
         /// 根据parendId获取小组广场

gx_api/GxPress/Api/GxPress.Api/WebControllers/UserController.cs

@@ -13,6 +13,7 @@ using GxPress.Common.Validation;
 using GxPress.Entity;
 using GxPress.EnumConst;
 using GxPress.Repository.Interface;
+using GxPress.Repository.Interface.Friends;
 using GxPress.Request.AddressBookGroup;
 using GxPress.Request.AddressBookGroupUser;
 using GxPress.Request.App.User;
@@ -53,11 +54,11 @@ namespace GxPress.Api.WebControllers
         private readonly IUserLoginRepository userLoginRepository;
         private readonly IAddressBookGroupRepository addressBookGroupRepository;
         private readonly IAddressBookGroupUserRepository _addressBookGroupUserRepository;
-
         private readonly IFeedbackRepository _feedbackRepository;
+        private readonly IFriendsRepository friendsRepository;
         public UserController(IUserRepository userRepository, IOptions<JwtOptions> jwtOptions,
             ILogger<UserController> logger, IDepartmentRepository departmentRepository, ILoginContext loginContext,
-            IUserService userService, IFileLibraryRepository fileLibraryRepository, IDistributedCache cache, IUserLoginRepository userLoginRepository, IAddressBookGroupRepository addressBookGroupRepository, IAddressBookGroupUserRepository _addressBookGroupUserRepository, IFeedbackRepository _feedbackRepository)
+            IUserService userService, IFileLibraryRepository fileLibraryRepository, IDistributedCache cache, IUserLoginRepository userLoginRepository, IAddressBookGroupRepository addressBookGroupRepository, IAddressBookGroupUserRepository _addressBookGroupUserRepository, IFeedbackRepository _feedbackRepository, IFriendsRepository friendsRepository)
         {
             _userRepository = userRepository;
             _departmentRepository = departmentRepository;
@@ -71,6 +72,7 @@ namespace GxPress.Api.WebControllers
             this.addressBookGroupRepository = addressBookGroupRepository;
             this._addressBookGroupUserRepository = _addressBookGroupUserRepository;
             this._feedbackRepository = _feedbackRepository;
+            this.friendsRepository = friendsRepository;
         }
         /// <summary>
         /// 登录
@@ -478,5 +480,15 @@ namespace GxPress.Api.WebControllers
         {
             return await _userService.FindUserInfoNoFriendsResultAsync(_loginContext.AccountId, keyword);
         }
+
+        /// <summary>
+        /// 删除我的好友
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("friends")]
+        public async Task<bool> DeleteAsync(IEnumerable<int> friendsIds)
+        {
+            return await friendsRepository.DeleteAsync(friendsIds, _loginContext.AccountId);
+        }
     }
 }

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebGroupController.cs

@@ -79,7 +79,7 @@ namespace GxPress.Api.WebControllers
         [AllowAnonymous]
         public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId)
         {
-            return await _groupService.GetAllAsync(categoryId);
+            return await _groupService.GetAllAsync(categoryId, _loginContext.AccountId);
         }
         /// <summary>
         /// 根据parendId获取小组广场

gx_api/GxPress/Model/GxPress.Entity/Group.cs

@@ -88,11 +88,21 @@ namespace GxPress.Entity
         /// <value></value>
         [DataColumn]
         public bool IsShow { get; set; }
-         /// <summary>
+        /// <summary>
         /// 历史用户头像
         /// </summary>
         /// <value></value>
         [DataColumn]
         public string HistoryAvatarUrl { get; set; }
+        /// <summary>
+        /// 是否申请
+        /// </summary>
+        /// <value></value>
+        public bool IsApply { get; set; }
+        /// <summary>
+        /// 是否加入
+        /// </summary>
+        /// <value></value>
+        public bool IsUser { get; set; }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupRepository.cs

@@ -423,7 +423,7 @@ namespace GxPress.Repository.Implement
         /// </summary>
         /// <param name="categoryId"></param>
         /// <returns></returns>
-        public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId)
+        public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId, int userId)
         {
             var sql = $@"SELECT 
                             *,
@@ -443,6 +443,29 @@ namespace GxPress.Repository.Implement
                             tede_group a
                         WHERE
                             a.GroupCategroyId = {categoryId} and a.IsShow=1";
+            if (userId > 0)
+            {
+                sql = $@"SELECT 
+                                *,
+                                (SELECT 
+                                        COUNT(1)
+                                    FROM
+                                        tede_group_user
+                                    WHERE
+                                        GroupId = a.Id AND UserId = {userId}
+                                    LIMIT 1) AS IsUser,
+                                (SELECT 
+                                        count(1)
+                                    FROM
+                                        tede_admin_verify
+                                    WHERE
+                                        SourceType = 1 AND VerifyType = 3
+                                            AND UserId = {userId}
+                                            AND DisposeType = 0
+                                            AND SourceId = a.Id limit 1) as IsApply
+                            FROM
+                                tede_group a";
+            }
             var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
             var database = new Database(databaseType, _connectionString);
             var connection = database.GetConnection();

gx_api/GxPress/Repository/GxPress.Repository.Interface/IGroupRepository.cs

@@ -83,7 +83,7 @@ namespace GxPress.Repository.Interface
         /// </summary>
         /// <param name="categoryId"></param>
         /// <returns></returns>
-        Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId);
+        Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId, int userId);
         /// <summary>
         /// 用户小组列表
         /// </summary>

gx_api/GxPress/Service/GxPress.Service.Implement/Group/GroupService.Category.cs

@@ -11,9 +11,9 @@ namespace GxPress.Service.Implement.Group
         /// </summary>
         /// <param name="categoryId"></param>
         /// <returns></returns>
-        public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId)
+        public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId,int userId)
         {
-            var group = await _groupRepository.GetAllAsync(categoryId);
+            var group = await _groupRepository.GetAllAsync(categoryId,userId);
             foreach (var item in group)
             {
                 item.AvatarUrl = Common.Tools.StringUtils.AddDomain(item.AvatarUrl);

gx_api/GxPress/Service/GxPress.Service.Interface/Group/IGroupService.cs

@@ -52,6 +52,6 @@ namespace GxPress.Service.Interface.Group
         /// </summary>
         /// <param name="categoryId"></param>
         /// <returns></returns>
-        Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId);
+        Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId,int userId);
     }
 }