Переглянути джерело

Merge branch 'dev_v1.3.8_20221107'

# Conflicts:
#	service.md
Eric 2 роки тому
батько
коміт
647f972aec

+ 10 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImUserFriendServiceImpl.java

@@ -188,6 +188,7 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
             // 新注册用户为老师身份时,更新好友关系为老师身份
             if (ClientEnum.TEACHER == clientType) {
 
+                // 更新我的身份信息
                 imUserFriendService.lambdaUpdate()
                         .eq(ImUserFriend::getUserId, userId)
                         .eq(ImUserFriend::getClientType, ClientEnum.STUDENT)
@@ -195,6 +196,15 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
                         .eq(ImUserFriend::getFriendType, ClientEnum.TEACHER)
                         .set(ImUserFriend::getClientType, ClientEnum.TEACHER)
                         .update();
+
+                // 更新客服好友身份信息
+                imUserFriendService.lambdaUpdate()
+                        .eq(ImUserFriend::getUserId, teacherId)
+                        .eq(ImUserFriend::getClientType, ClientEnum.TEACHER)
+                        .eq(ImUserFriend::getFriendId, userId)
+                        .eq(ImUserFriend::getFriendType, ClientEnum.STUDENT)
+                        .set(ImUserFriend::getFriendType, ClientEnum.TEACHER)
+                        .update();
             }
         }
 

+ 2 - 2
service.md

@@ -1,7 +1,7 @@
 - [ ] gateway-server
 - [ ] auth-server
-- [ ] admin-server
-- [x] teacher-server
+- [x] admin-server
+- [ ] teacher-server
 - [ ] student-server
 - [ ] website-server
 - [ ] task-server