|
|
@@ -104,7 +104,7 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
|
|
|
.eq("phone", receiverId.substring(7)));
|
|
|
currentLawyerId = currentLawyer != null ? currentLawyer.getId() : null;
|
|
|
}
|
|
|
- Map<String, Boolean> chatEnabledCache = new HashMap<>();
|
|
|
+ Map<String, String> chatEnabledCache = new HashMap<>();
|
|
|
|
|
|
// 当前用户的所有关注
|
|
|
LambdaQueryWrapper<LifeFans> followWrapper = new LambdaQueryWrapper<>();
|
|
|
@@ -134,7 +134,7 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
|
|
|
List<String> notDisturbList = lifeMessageNotDisturbMapper.selectList(notDisturbWrapper).stream().map(LifeMessageNotDisturb::getNotDisturbId).collect(Collectors.toList());
|
|
|
|
|
|
for (LifeMessageVo messageVo : lifeMessagePageList) {
|
|
|
- messageVo.setCanChat(true);
|
|
|
+ messageVo.setCanChat("1");
|
|
|
String messagePhoneId = messageVo.getPhoneId();
|
|
|
if (messagePhoneId != null && (currentIsUser || currentIsLawyer)) {
|
|
|
if (currentIsUser && messagePhoneId.startsWith("lawyer_")) {
|
|
|
@@ -199,9 +199,9 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private boolean isChatEnabled(Integer userId, Integer lawyerId, Map<String, Boolean> cache) {
|
|
|
+ private String isChatEnabled(Integer userId, Integer lawyerId, Map<String, String> cache) {
|
|
|
if (userId == null || lawyerId == null) {
|
|
|
- return true;
|
|
|
+ return "1";
|
|
|
}
|
|
|
String cacheKey = userId + "_" + lawyerId;
|
|
|
if (cache.containsKey(cacheKey)) {
|
|
|
@@ -221,8 +221,13 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
|
|
|
&& !Objects.equals(status, LawyerStatusEnum.CANCEL.getStatus())
|
|
|
&& !Objects.equals(status, LawyerStatusEnum.REFUNDED.getStatus());
|
|
|
}
|
|
|
- cache.put(cacheKey, enabled);
|
|
|
- return enabled;
|
|
|
+ String chatStr = "1";
|
|
|
+ if(!enabled){
|
|
|
+ chatStr = "0";
|
|
|
+ }
|
|
|
+
|
|
|
+ cache.put(cacheKey, chatStr);
|
|
|
+ return chatStr;
|
|
|
}
|
|
|
|
|
|
@Override
|