好友逻辑调整

core/src/main/java/com/wecloud/im/friend/service/ImFriendService.java

@@ -102,7 +102,7 @@ public class ImFriendService extends BaseServiceImpl<ImFriendMapper, ImFriend> {
             if(StringUtils.isNotEmpty(friendName)) {
                 my.setFriendName(friendName);
             }
-            this.updateByKeyAndClaimer(my);
+            this.updateByKey(my);
         } else {
             my.setId(SnowflakeUtil.getId());
             my.setCreateTime(new Date());
@@ -119,10 +119,7 @@ public class ImFriendService extends BaseServiceImpl<ImFriendMapper, ImFriend> {
             if(StringUtils.isNotEmpty(requestRemark)) {
                 friend.setRequestRemark(requestRemark);
             }
-            if(StringUtils.isNotEmpty(friendName)) {
-                friend.setFriendName(friendName);
-            }
-            this.updateByKeyAndClaimer(friend);
+            this.updateByKey(friend);
         } else {
             friend.setId(SnowflakeUtil.getId());
             friend.setCreateTime(new Date());
@@ -146,8 +143,7 @@ public class ImFriendService extends BaseServiceImpl<ImFriendMapper, ImFriend> {
     public ImFriend getByKey(String clientId, String friendClientId) {
         return this.getOne(new QueryWrapper<ImFriend>().lambda()
                 .eq(ImFriend::getClientId, clientId)
-                .eq(ImFriend::getClientIdFriend, friendClientId)
-                .in(ImFriend::getState, Lists.newArrayList(FriendStateEnum.UNSURE.getCode(), FriendStateEnum.CONFORM.getCode())));
+                .eq(ImFriend::getClientIdFriend, friendClientId));
     }
 
     /**
@@ -165,6 +161,19 @@ public class ImFriendService extends BaseServiceImpl<ImFriendMapper, ImFriend> {
     }
 
     /**
+     * 根据 自己id和好友id，更新好友信息
+     * @param imFriend
+     */
+    public boolean updateByKey(ImFriend imFriend) {
+        // 不更新id
+        imFriend.setId(null);
+        imFriend.setCreateTime(null);
+        return this.update(imFriend, new QueryWrapper<ImFriend>().lambda()
+                .eq(ImFriend::getClientId, imFriend.getClientId())
+                .eq(ImFriend::getClientIdFriend, imFriend.getClientIdFriend()));
+    }
+
+    /**
      * 好友通过/拒绝
      * @param currentClient
      * @param friendClient
@@ -186,7 +195,7 @@ public class ImFriendService extends BaseServiceImpl<ImFriendMapper, ImFriend> {
         if(StringUtils.isNotEmpty(rejectRemark)) {
             friend.setRejectRemark(rejectRemark);
         }
-        boolean ok1 = this.updateByKeyAndClaimer(friend);
+        boolean ok1 = this.updateByKey(friend);
         // 同时更新我的
         ImFriend my = new ImFriend();
         my.setClientId(currentClient.getClientId());
@@ -196,7 +205,7 @@ public class ImFriendService extends BaseServiceImpl<ImFriendMapper, ImFriend> {
         if(StringUtils.isNotEmpty(rejectRemark)) {
             my.setRejectRemark(rejectRemark);
         }
-        boolean ok2 = this.updateByKeyAndClaimer(my);
+        boolean ok2 = this.updateByKey(my);
 
         friendEventSender.sendFriendApproveEventMsg(currentClient, friendClient, agree, rejectRemark);