Merge branch 'feature/0726-kf' into online

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -34,6 +34,7 @@ import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.VipCardRecordWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherWrapper;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.CacheNameEnum;
@@ -891,10 +892,11 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
 
         save(student);
         //  与好友数量最少的客服建立好友关系
-        Teacher customerService = teacherDao.getCustomerServiceByFriendLeast();
-        if (customerService != null) {
+        List<TeacherWrapper.TeacherFriend> customerServiceFriendNums = teacherDao.getCustomerServiceFriendNums();
+        if (!customerServiceFriendNums.isEmpty()) {
+            Long teacherId = customerServiceFriendNums.get(0).getTeacherId();
             imUserFriendService.registerUserBindCustomerService(student.getUserId(),
-                    Collections.singletonList(customerService.getUserId()), ClientEnum.STUDENT);
+                    Collections.singletonList(teacherId), ClientEnum.STUDENT);
         }
         try {
             // 注册IM

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -633,10 +633,11 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
 
             //  与客服建立好友
             if (!Boolean.TRUE.equals(teacher.getCustomerService())) {
-                Teacher customerServiceTeacher = getCustomerServiceByFriendLeast();
-                if (customerServiceTeacher != null) {
+                List<TeacherWrapper.TeacherFriend> customerServiceFriendNums = this.getBaseMapper().getCustomerServiceFriendNums();
+                if (!customerServiceFriendNums.isEmpty()) {
+                    Long teacherId = customerServiceFriendNums.get(0).getTeacherId();
                     imUserFriendService.registerUserBindCustomerService(teacher.getUserId(),
-                            Collections.singletonList(customerServiceTeacher.getUserId()), ClientEnum.TEACHER);
+                            Collections.singletonList(teacherId), ClientEnum.TEACHER);
                 }
             }
         } else {
@@ -646,6 +647,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             if (Boolean.TRUE.equals(customerService) && Boolean.FALSE.equals(teacherSubmitReq.getCustomerService())) {
                 customerServiceSendMsg2User.addAll(transferFriendV2(teacher.getUserId(), true));
                 clearUserCustomerRelation(teacherSubmitReq.getUserId());
+                this.update(null, new UpdateWrapper<Teacher>().lambda()
+                        .set(Teacher::getCustomerId, null)
+                        .eq(Teacher::getUserId, teacherSubmitReq.getUserId()));
+                teacher.setCustomerId(null);
             }
             // 如果机构解绑，更新机构ID为-1
             if (Boolean.TRUE.equals(teacherSubmitReq.getBindTenant())) {
@@ -1508,6 +1513,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (UserLockFlag.NORMAL.equals(teacher.getLockFlag()) && Boolean.TRUE.equals(customerService)) {
             List<TeacherWrapper.CustomerServiceSendMsg2User> customerServiceSendMsg2User = transferFriendV2(teacherId, false);
             clearUserCustomerRelation(teacherId);
+            this.update(null, new UpdateWrapper<Teacher>().lambda()
+                    .set(Teacher::getCustomerId, null)
+                    .eq(Teacher::getUserId, teacherId));
+            teacher.setCustomerId(null);
             for (TeacherWrapper.CustomerServiceSendMsg2User serviceSendMsg2User : customerServiceSendMsg2User) {
                 String customerMessage = sysConfigService.findConfigValue(SysConfigConstant.CUSTOMER_SERVICE_ADD_MSG);
                 String customerTitle = sysConfigService.findConfigValue(SysConfigConstant.CUSTOMER_SERVICE_ADD_MSG_TITLE);