Merge branch 'feature-recommend3' into 'developer'

获取时间最相近的一条

See merge request !2890

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

@@ -904,13 +904,17 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         if(qwDTO.needOpenUserId3th()) {
             wxUserId = staff.getWxOpenUseId() ;
         }
+        Long sendTimeSec = sendTime.getTime() / 1000;
         // 发送到群
         List<QywxGroupMessageInfoDTO> msgList = this.queryGroupMsg(groupMsgChatType,startTime, endTime, qwDTO, wxUserId);
         if(CollectionUtils.isNotEmpty(msgList)) {
             if(msgList.size()==0) {
                 return msgList.get(0).getMsgId() ;
             }else {
-                return msgList.get(msgList.size()-1).getMsgId() ;
+                return msgList.stream()
+                        .min(Comparator.comparingLong(msg -> Math.abs(msg.getCreateTime() - sendTimeSec)))
+                        .map(QywxGroupMessageInfoDTO::getMsgId)
+                        .orElse(null);
             }
         }
         return null ;