修改提前还车逻辑

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -8,8 +8,10 @@ import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.ImiVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.im.dto.CommentVo;
 import com.xxfc.platform.im.dto.PraiseVo;
+import com.xxfc.platform.im.dto.QuestionParamDto;
 import com.xxfc.platform.im.model.Comment;
 import com.xxfc.platform.im.model.Msg;
 import com.xxfc.platform.im.model.Praise;
@@ -38,6 +40,9 @@ public class MsgBiz {
     @Autowired
     UserBiz userBiz;
 
+    @Autowired
+    ImQuestionBiz imQuestionBiz;
+
     /**
      * 获取消息列表
      *
@@ -139,6 +144,11 @@ public class MsgBiz {
             if(type != null) {
                 ids.add(type);
             }
+            if(type == 5) {
+                QuestionParamDto questionParamDto = new QuestionParamDto();
+                questionParamDto.setUserId(Long.parseLong(userId + ""));
+                return imQuestionBiz.getList(questionParamDto);
+            }
             Query query = new Query(Criteria.where("body.type").in(ids));
             query.addCriteria(Criteria.where("userId").is(userId));
             int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
@@ -148,7 +158,7 @@ public class MsgBiz {
             List<MsgVo> msgVoList = replaceMsgResult(msgList);
             PageInfo<MsgVo> goodPageInfo = new PageInfo<>(msgVoList);
             goodPageInfo.setPageSize(totalSize%limit == 0 ?totalSize/limit : totalSize/limit + 1);
-            return ObjectRestResponse.succ(goodPageInfo);
+            return ObjectRestResponse.succ(PageDataVO.pageInfo(goodPageInfo));
 
     }