update 工单系统,客服回复空格丢失问题 。挖矿账户钱包总余额展示
This commit is contained in:
@@ -22,6 +22,7 @@ import com.m2pool.system.api.RemoteUserService;
|
||||
import com.m2pool.system.api.entity.SysUser;
|
||||
import io.jsonwebtoken.lang.Collections;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.messaging.simp.user.SimpUser;
|
||||
import org.springframework.messaging.simp.user.SimpUserRegistry;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@@ -95,8 +96,8 @@ public class ChatRoomServiceImpl extends ServiceImpl<ChatRoomMapper, ChatRoom> i
|
||||
int i = random.nextInt(customerEmails.size());
|
||||
String email = customerEmails.get(i);
|
||||
customerEmails.removeIf(email1 -> !checkOnline(email1));
|
||||
System.out.println("bby-在线的客服"+customerEmails + "初始化分配的客服"+email+"聊天室信息"+roomByUserEmail);
|
||||
if(roomByUserEmail != null){
|
||||
System.out.println("bby-在线的客服"+customerEmails + "初始化分配的客服"+email+"聊天室信息"+roomByUserEmail);
|
||||
//1.1 客服在线,并且在客服列表
|
||||
if (checkOnline(roomByUserEmail.getUserEmail()) && customerEmails.contains(roomByUserEmail.getUserEmail())) {
|
||||
roomByUserEmail.setCustomerIsOnline(true);
|
||||
@@ -127,6 +128,7 @@ public class ChatRoomServiceImpl extends ServiceImpl<ChatRoomMapper, ChatRoom> i
|
||||
List<SysUser> data = remoteUserService.getCSList().getData();
|
||||
List<String> emails = data.stream().map(SysUser::getEmail).collect(Collectors.toList());
|
||||
emails.removeIf(email1 -> !checkOnline(email1));
|
||||
|
||||
//如果当前没有客服角色账号,使用nacos 默认配置中的客服角色
|
||||
if(Collections.isEmpty(emails)){
|
||||
emails = customerEmails;
|
||||
@@ -135,8 +137,8 @@ public class ChatRoomServiceImpl extends ServiceImpl<ChatRoomMapper, ChatRoom> i
|
||||
return R.fail("您作为管理员无法创建与自己的连接");
|
||||
}
|
||||
}
|
||||
System.out.println("bby-在线的客服-创建聊天室emails"+emails);
|
||||
boolean customerIsOnline = false;
|
||||
|
||||
//有在线客服,再次分配给在线的客服
|
||||
if (!emails.isEmpty()){
|
||||
customerIsOnline = true;
|
||||
|
||||
Reference in New Issue
Block a user