Merge branch 'sit' of http://8.152.195.41:3000/alien/alien_cloud into store-plantform

alien-job/src/main/java/shop/alien/job/store/LawyerOrderJob.java

@@ -3,6 +3,7 @@ package shop.alien.job.store;
 import com.alibaba.fastjson2.util.DateUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.RequiredArgsConstructor;
@@ -43,10 +44,13 @@ public class LawyerOrderJob {
                     .eq(LawyerConsultationOrder::getOrderStatus, 2)
                     .eq(LawyerConsultationOrder::getDeleteFlag, 0);
             List<LawyerConsultationOrder> lawyerConsultationOrders = lawyerConsultationOrderMapper.selectList(lambdaQueryWrapper);
-            LambdaUpdateWrapper<LawyerConsultationOrder> lawyerConsultationOrderLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-            lawyerConsultationOrderLambdaUpdateWrapper.set(LawyerConsultationOrder::getOrderStatus, 3)
-                    .in(LawyerConsultationOrder::getId, lawyerConsultationOrders.stream().map(LawyerConsultationOrder::getId).collect(Collectors.toList()));
-            lawyerConsultationOrderMapper.update(null, lawyerConsultationOrderLambdaUpdateWrapper);
+            List<Integer> collect = lawyerConsultationOrders.stream().map(LawyerConsultationOrder::getId).collect(Collectors.toList());
+            if (ObjectUtils.isNotEmpty( collect) && !collect.isEmpty()) {
+                LambdaUpdateWrapper<LawyerConsultationOrder> lawyerConsultationOrderLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+                lawyerConsultationOrderLambdaUpdateWrapper.set(LawyerConsultationOrder::getOrderStatus, 3)
+                        .in(LawyerConsultationOrder::getId, collect);
+                lawyerConsultationOrderMapper.update(null, lawyerConsultationOrderLambdaUpdateWrapper);
+            }
         } else {
             log.info("开始执行待接单订单超时处理任务");
             String format = DateUtils.format(shop.alien.util.common.DateUtils.calcDays(new Date(), -4), "yyyy-MM-dd");
@@ -55,10 +59,13 @@ public class LawyerOrderJob {
                     .like(LawyerConsultationOrder::getAcceptOrdersTime, format)
                     .eq(LawyerConsultationOrder::getDeleteFlag, 0);
             List<LawyerConsultationOrder> lawyerConsultationOrders = lawyerConsultationOrderMapper.selectList(lambdaQueryWrapper);
-            LambdaUpdateWrapper<LawyerConsultationOrder> lawyerConsultationOrderLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-            lawyerConsultationOrderLambdaUpdateWrapper.set(LawyerConsultationOrder::getOrderStatus, 3)
-                    .in(LawyerConsultationOrder::getId, lawyerConsultationOrders.stream().map(LawyerConsultationOrder::getId).collect(Collectors.toList()));
-            lawyerConsultationOrderMapper.update(null, lawyerConsultationOrderLambdaUpdateWrapper);
+            List<Integer> collect = lawyerConsultationOrders.stream().map(LawyerConsultationOrder::getId).collect(Collectors.toList());
+            if (ObjectUtils.isNotEmpty( collect) && !collect.isEmpty()) {
+                LambdaUpdateWrapper<LawyerConsultationOrder> lawyerConsultationOrderLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+                lawyerConsultationOrderLambdaUpdateWrapper.set(LawyerConsultationOrder::getOrderStatus, 3)
+                        .in(LawyerConsultationOrder::getId, collect);
+                lawyerConsultationOrderMapper.update(null, lawyerConsultationOrderLambdaUpdateWrapper);
+            }
         }
     }
 }

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

@@ -397,9 +397,9 @@ public class LawyerClientConsultationOrderServiceImpl extends ServiceImpl<Lawyer
 
         // 提取所有律师ID，并加上lawyer_前缀
         List<String> lawyerIdList = orderList.stream()
-                .map(LawyerConsultationOrderVO::getLawyerPhone)
+                .map(LawyerConsultationOrderVO::getClientUserPhone)
                 .filter(Objects::nonNull)
-                .map(phone -> "lawyer_" + phone)
+                .map(phone -> "user_" + phone)
                 .distinct()
                 .collect(Collectors.toList());
 
@@ -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.getClientUserPhone();
+            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);
             }
-        });
+        }
     }
 
 

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

@@ -117,6 +117,8 @@ public class LawyerUserLogInServiceImpl extends ServiceImpl<LawyerUserMapper, La
             user.setOrderReceivingStatus(1);
             user.setPassType(2);
             user.setConsultationFee(Integer.parseInt(lawyerFee));
+            user.setNickName(user.getName() != null && !user.getName().isEmpty() ?
+                    user.getName().charAt(0) + "律师" : "律师");
             lawyerUserMapper.insert(user);
             List<Integer> problemScenarioIds = lawyerUserDto.getProblemScenarioIds();
             for (int i = 0; i < problemScenarioIds.size(); i++) {
@@ -167,6 +169,7 @@ public class LawyerUserLogInServiceImpl extends ServiceImpl<LawyerUserMapper, La
         LawyerUser lawyerUser = new LawyerUser();
         lawyerUser.setId(lawyerUserDto.getId());
         lawyerUser.setLastOnlineTime(new Date());
+        lawyerUser.setIsOnline(0);
         lawyerUserMapper.updateById(lawyerUser);
         baseRedisService.delete("lawyer_" + lawyerUserDto.getPhone());
         return R.success("退出成功");

alien-store/src/main/java/shop/alien/store/service/impl/LifeMessageServiceImpl.java

@@ -20,6 +20,7 @@ import shop.alien.store.service.LifeMessageService;
 import shop.alien.store.service.LifeUserService;
 import shop.alien.util.common.JwtUtil;
 
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
@@ -81,6 +82,7 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
             }
             wrapper.orderByDesc("message.created_time");
             List<LifeMessageVo> lifeMessagePageList = lifeMessageMapper.getLifeMessagePageByPhoneId(receiverId, wrapper);
+            List<LifeMessageVo> lifeMessagePageResultList = new ArrayList<>();
             if (!CollectionUtils.isEmpty(lifeMessagePageList)) {
                 // 当前用户的所有关注
                 LambdaQueryWrapper<LifeFans> followWrapper = new LambdaQueryWrapper<>();
@@ -141,10 +143,16 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
                     } else {
                         messageVo.setIsMerchant("0");
                     }
+
+                    String senderId = messageVo.getPhoneId();
+                    if (senderId != null && senderId.startsWith("lawyer_")) {
+                        continue;
+                    }
+                    lifeMessagePageResultList.add(messageVo);
                 }
             }
 
-            return lifeMessagePageList;
+            return lifeMessagePageResultList;
         } catch (Exception e) {
             log.error("LifeMessageServiceImpl.getMessageList Error Mgs={}", e.getMessage());
             throw new Exception(e);
@@ -227,9 +235,18 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
             wrapper.orderByDesc("message.created_time");
 //        IPage<LifeMessageVo> ipage = new Page<>(1, Integer.MAX_VALUE);
             List<LifeMessageVo> lifeMessageVoList = lifeMessageMapper.getLifeMessagePageByPhoneId(receiverId, wrapper);
+            LifeMessageVo messageVos = null;
+            if(CollectionUtils.isEmpty(lifeMessageVoList)){
+                return messageVos;
+            }
+
+            lifeMessageVoList.sort(Comparator.comparing(LifeMessageVo::getCreatedTime).reversed());
+            for(LifeMessageVo messageVo : lifeMessageVoList) {
+                    String senderId = messageVo.getPhoneId();
+                    if (senderId != null && senderId.startsWith("lawyer_")) {
+                        continue;
+                    }
 
-            LifeMessageVo messageVo = lifeMessageVoList.stream().max(Comparator.comparing(LifeMessageVo::getCreatedTime)).orElse(null);
-            if (messageVo != null) {
                 messageVo.setNotReadCount(lifeMessageVoList.stream().filter(item -> 0 == item.getIsRead()).count());
                 // 根据手机号查询发送人信息
                 String storePhones = "''";
@@ -244,9 +261,10 @@ public class LifeMessageServiceImpl extends ServiceImpl<LifeMessageMapper, LifeM
                     messageVo.setUserName(userList.get(0).getUserName());
                     messageVo.setUserImage(userList.get(0).getUserImage());
                 }
+                messageVos = messageVo;
+                break;
             }
-
-            return messageVo;
+            return messageVos;
         } catch (Exception e) {
             log.error("LifeMessageServiceImpl.getNoFriendMessageNum Error Mgs={}", e.getMessage());
             throw new Exception(e);

alien-store/src/main/java/shop/alien/store/service/impl/StoreClockInServiceImpl.java

@@ -68,6 +68,7 @@ public class StoreClockInServiceImpl extends ServiceImpl<StoreClockInMapper, Sto
                     .eq("clock.delete_flag", 0)
                     .eq("user.delete_flag", 0)
                     .eq("store.delete_flag", 0)
+                    .isNotNull(0 == mySelf, "clock.img_url")
                     .and(wrapper1 ->
                             wrapper1.eq("clock.permission", 1)
                                     .or(wSub ->
@@ -86,6 +87,7 @@ public class StoreClockInServiceImpl extends ServiceImpl<StoreClockInMapper, Sto
         }
         QueryWrapper<StoreClockIn> wrapper = new QueryWrapper<>();
         wrapper.eq(1 == mySelf, "clock.user_id", userId);
+        wrapper.isNotNull(0 == mySelf, "clock.img_url");
         wrapper.eq("clock.delete_flag", 0);
         wrapper.eq("user.delete_flag", 0);
         wrapper.eq("store.delete_flag", 0);