|
|
@@ -40,6 +40,7 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
|
|
|
private final LifeMessageNotDisturbMapper lifeMessageNotDisturbMapper;
|
|
|
private final LifeBlacklistMapper lifeBlacklistMapper;
|
|
|
private final LifeNoticeMapper lifeNoticeMapper;
|
|
|
+ private final LawyerUserMapper lawyerUserMapper;
|
|
|
|
|
|
@Override
|
|
|
public List<LifeMessageVo> getMessageList(String receiverId, int friendType, String search) throws Exception {
|
|
|
@@ -258,26 +259,34 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
|
|
|
// 获取发送方与接收方头像
|
|
|
LifeUser lifeUser1 = null;
|
|
|
StoreImg storeImg = null;
|
|
|
+ LawyerUser lawyerUser = null;
|
|
|
if (receiverId.startsWith("user_")) {
|
|
|
lifeUser1 = lifeUserMapper.selectOne(new QueryWrapper<LifeUser>().eq("user_phone", receiverId.substring(5)));
|
|
|
- } else {
|
|
|
+ } else if (receiverId.startsWith("store_")) {
|
|
|
StoreUser storeUser1 = storeUserService.getOne(new QueryWrapper<StoreUser>().eq("phone", receiverId.substring(6)));
|
|
|
List<StoreImg> storeImgList = storeImgService.getStoreImg(storeUser1.getStoreId(), 10);
|
|
|
if (!storeImgList.isEmpty()) {
|
|
|
storeImg = storeImgList.get(0);
|
|
|
}
|
|
|
+ } else{
|
|
|
+ // 律师端
|
|
|
+ lawyerUser = lawyerUserMapper.selectOne(new QueryWrapper<LawyerUser>().eq("phone", receiverId.substring(7)));
|
|
|
}
|
|
|
|
|
|
LifeUser lifeUser2 = null;
|
|
|
StoreImg storeImg1 = null;
|
|
|
+ LawyerUser lawyerUser1 = null;
|
|
|
if (senderId.startsWith("user_")) {
|
|
|
lifeUser2 = lifeUserMapper.selectOne(new QueryWrapper<LifeUser>().eq("user_phone", senderId.substring(5)));
|
|
|
- } else {
|
|
|
+ } else if (senderId.startsWith("store_")) {
|
|
|
StoreUser storeUser2 = storeUserService.getOne(new QueryWrapper<StoreUser>().eq("phone", senderId.substring(6)));
|
|
|
List<StoreImg> storeImgList = storeImgService.getStoreImg(storeUser2.getStoreId(), 10);
|
|
|
if (!storeImgList.isEmpty()) {
|
|
|
storeImg1 = storeImgList.get(0);
|
|
|
}
|
|
|
+ } else {
|
|
|
+ // 律师端
|
|
|
+ lawyerUser1 = lawyerUserMapper.selectOne(new QueryWrapper<LawyerUser>().eq("phone", senderId.substring(7)));
|
|
|
}
|
|
|
|
|
|
List<LifeMessageVo> lifeMessageVos = lifeMessageMapper.getMessageListByReceiverId(receiverId, senderId);
|
|
|
@@ -287,23 +296,32 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
|
|
|
lifeMessageVo.setReceiverImg(lifeUser1.getUserImage());
|
|
|
} else if (null != storeImg) {
|
|
|
lifeMessageVo.setReceiverImg(storeImg.getImgUrl());
|
|
|
+ } else if (null != lawyerUser){
|
|
|
+ lifeMessageVo.setReceiverImg(lawyerUser.getHeadImg());
|
|
|
}
|
|
|
|
|
|
if (null != lifeUser2) {
|
|
|
lifeMessageVo.setSenderImg(lifeUser2.getUserImage());
|
|
|
} else if (null != storeImg1) {
|
|
|
lifeMessageVo.setSenderImg(storeImg1.getImgUrl());
|
|
|
+ } else if (null != lawyerUser1) {
|
|
|
+ lifeMessageVo.setSenderImg(lawyerUser1.getHeadImg());
|
|
|
}
|
|
|
} else {
|
|
|
if (null != lifeUser1) {
|
|
|
lifeMessageVo.setSenderImg(lifeUser1.getUserImage());
|
|
|
} else if (null != storeImg) {
|
|
|
lifeMessageVo.setSenderImg(storeImg.getImgUrl());
|
|
|
+ } else if (null != lawyerUser) {
|
|
|
+ lifeMessageVo.setSenderImg(lawyerUser.getHeadImg());
|
|
|
}
|
|
|
+
|
|
|
if (null != lifeUser2) {
|
|
|
lifeMessageVo.setReceiverImg(lifeUser2.getUserImage());
|
|
|
} else if (null != storeImg1) {
|
|
|
lifeMessageVo.setReceiverImg(storeImg1.getImgUrl());
|
|
|
+ } else if (null != lawyerUser1) {
|
|
|
+ lifeMessageVo.setReceiverImg(lawyerUser1.getHeadImg());
|
|
|
}
|
|
|
}
|
|
|
}
|