新增通知接口

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerClientConsultationOrderServiceImpl.java

@@ -417,21 +417,23 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
         lifeMessageLambdaQueryWrapper.eq(LifeMessage::getReceiverId, "lawyer_" + phone);
         List<LifeMessage> lifeMessageList = lifeMessageMapper.selectList(lifeMessageLambdaQueryWrapper);
 
-        // 按照senderId进行分组，返回senderId和数量的map
-        Map<String, Long> senderIdCountMap = lifeMessageList.stream()
-                .collect(Collectors.groupingBy(LifeMessage::getSenderId, Collectors.counting()));
 
-        // 填充问题场景
-        orderList.forEach(order -> {
-            String userPhone = "user_" + order.getClientUserPhone();
+        // 按照senderId进行分组，返回senderId和数量的map
+        Map<String, Long> senderIdCountMap = new HashMap<>();
+        if(CollectionUtils.isNotEmpty(lifeMessageList)){
+            senderIdCountMap = lifeMessageList.stream()
+                    .collect(Collectors.groupingBy(LifeMessage::getSenderId, Collectors.counting()));
+        }
 
-            if(!senderIdCountMap.isEmpty()&&senderIdCountMap.containsKey(userPhone)&&order.getOrderStatus() == 2){
-                long messageCount = senderIdCountMap.get(userPhone);
-                order.setUnreadMessage(messageCount);
-            } else{
-                order.setUnreadMessage(0L);
+        for(LawyerConsultationOrderVO lawyerConsultationOrderVO : voPage.getRecords()){
+            String lawyerPhone = "user_" + lawyerConsultationOrderVO.getLawyerPhone();
+            if(!senderIdCountMap.isEmpty() && senderIdCountMap.containsKey(lawyerPhone) && lawyerConsultationOrderVO.getOrderStatus() == 2){
+                long messageCount = senderIdCountMap.get(lawyerPhone);
+                lawyerConsultationOrderVO.setUnreadMessage(messageCount);
+            } else {
+                lawyerConsultationOrderVO.setUnreadMessage(0L);
             }
-        });
+        }
     }
 
     /**

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerConsultationOrderServiceImpl.java

@@ -879,19 +879,21 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
         List<LifeMessage> lifeMessageList = lifeMessageMapper.selectList(lifeMessageLambdaQueryWrapper);
 
         // 按照senderId进行分组，返回senderId和数量的map
-        Map<String, Long> senderIdCountMap = lifeMessageList.stream()
-                .collect(Collectors.groupingBy(LifeMessage::getSenderId, Collectors.counting()));
+        Map<String, Long> senderIdCountMap = new HashMap<>();
+        if(CollectionUtils.isNotEmpty(lifeMessageList)){
+            senderIdCountMap = lifeMessageList.stream()
+                    .collect(Collectors.groupingBy(LifeMessage::getSenderId, Collectors.counting()));
+        }
 
-        // 填充问题场景
-        orderList.forEach(order -> {
-            String lawyerPhone = "lawyer_" + order.getLawyerPhone();
-            if(!senderIdCountMap.isEmpty()&&senderIdCountMap.containsKey(lawyerPhone)&&order.getOrderStatus() == 2){
+        for(LawyerConsultationOrderVO lawyerConsultationOrderVO : voPage.getRecords()){
+            String lawyerPhone = "lawyer_" + lawyerConsultationOrderVO.getLawyerPhone();
+            if(!senderIdCountMap.isEmpty() && senderIdCountMap.containsKey(lawyerPhone) && lawyerConsultationOrderVO.getOrderStatus() == 2){
                 long messageCount = senderIdCountMap.get(lawyerPhone);
-                order.setUnreadMessage(messageCount);
+                lawyerConsultationOrderVO.setUnreadMessage(messageCount);
             } else {
-                order.setUnreadMessage(0L);
+                lawyerConsultationOrderVO.setUnreadMessage(0L);
             }
-        });
+        }
     }