系统通知状态更改

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/EvaluateDTO.java

@@ -9,5 +9,37 @@ public class EvaluateDTO implements Serializable {
 
     private static final long serialVersionUID = 2178904797700518635L;
 
+    private DynamicContentDTO dynamicContentDTO;
 
+    private DynamicCommentDTO dynamicCommentDTO;
+
+    /**
+     * 唯一标识
+     */
+    private Long id;
+
+    /**
+     * 用户标识
+     */
+    private Long userId;
+
+    /**
+     * 用户标识
+     */
+    private Long targetUserId;
+
+    /**
+     * 操作类型：1-点赞；2-踩
+     */
+    private Integer operaterType;
+
+    /**
+     * 内容类型：1-动态；2-评论/回复
+     */
+    private Integer contentType;
+
+    /**
+     * 内容标识
+     */
+    private Long contentId;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/NewInformDTO.java

@@ -2,8 +2,10 @@ package com.chelvc.cloud.vehicle.api.dto;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class NewInformDTO {
+public class NewInformDTO implements Serializable {
 
     /**
      * 订单通知数

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/DynamicCommentService.java

@@ -1,13 +1,12 @@
 package com.chelvc.cloud.vehicle.api.service;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chelvc.cloud.vehicle.api.constant.ExamineType;
 import com.chelvc.cloud.vehicle.api.dto.DynamicCommentDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicCommentParam;
 import com.chelvc.cloud.vehicle.api.param.QueryAdminDynamicParam;
 import com.chelvc.cloud.vehicle.api.param.QueryDynamicCommentParam;
-import com.chelvc.framework.common.model.PagedVO;
+import com.chelvc.framework.common.model.Pagination;
 
 /**
  * 动态评论Service接口
@@ -20,12 +19,12 @@ public interface DynamicCommentService {
     /**
      * 查询动态评论列表
      */
-    IPage<DynamicCommentDTO> queryPageList(QueryDynamicCommentParam param, Integer pageNum, Integer pageSize);
+    Pagination<DynamicCommentDTO> queryPageList(QueryDynamicCommentParam param, Integer pageNum, Integer pageSize);
 
     /**
      * 查询动态信息列表
      */
-    PagedVO<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
+    Pagination<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
                                                   Long pageSize);
 
     /**

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/DynamicContentService.java

@@ -1,12 +1,11 @@
 package com.chelvc.cloud.vehicle.api.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chelvc.cloud.vehicle.api.constant.ExamineType;
 import com.chelvc.cloud.vehicle.api.dto.DynamicContentDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicContentParam;
 import com.chelvc.cloud.vehicle.api.param.QueryAdminDynamicParam;
 import com.chelvc.cloud.vehicle.api.param.QueryDynamicContentParam;
-import com.chelvc.framework.common.model.PagedVO;
+import com.chelvc.framework.common.model.Pagination;
 
 import java.util.Map;
 
@@ -26,19 +25,19 @@ public interface DynamicContentService {
   /**
    * 查询动态信息列表
    */
-  IPage<DynamicContentDTO> queryPageList(QueryDynamicContentParam param, Integer pageNum,
-                                         Integer pageSize, Long userId);
+  Pagination<DynamicContentDTO> queryPageList(QueryDynamicContentParam param, Integer pageNum,
+                                              Integer pageSize, Long userId);
 
   /**
    * 查询动态信息列表
    */
-  PagedVO<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
+  Pagination<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
                                                 Long pageSize);
 
   /**
    * 查询动态信息列表
    */
-  IPage<DynamicContentDTO> queryUserById(Long selfUserId, Long userId, Integer pageNum, Integer pageSize);
+  Pagination<DynamicContentDTO> queryUserById(Long selfUserId, Long userId, Integer pageNum, Integer pageSize);
 
   /**
    * 修改动态信息

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/InformService.java

@@ -46,7 +46,7 @@ public interface InformService {
      * @param paging 分页信息
      * @return 用户的订单通知列表
      */
-    Pagination<OmsOrderPayHistoryDTO> selectEvaluateListByUserId(Long userId, Paging paging);
+    Pagination<EvaluateDTO> selectEvaluateListByUserId(Long userId, Paging paging);
 
     /**
      * 将新点赞回复通知标识更改

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/DynamicCommentMapper.java

@@ -34,7 +34,7 @@ public interface DynamicCommentMapper extends BaseMapper<DynamicComment> {
     @Update("update dynamic_comment set bad_num = bad_num - 1 where id = #{contentId}")
     int reduceBadNum(Long contentId);
 
-    @Update("update dynamic_comment set platform_status = #{type} where is_deleted = 0 and  user_id = #{userId}")
+    @Update("update dynamic_comment set platform_status = #{type} where deleted = 0 and  user_id = #{userId}")
     int shieldByUserId(@Param("userId")Long userId, @Param("type")int type);
 
     @Update("update dynamic_comment set comment_num = comment_num + 1 where id = #{dynamicId}")

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/DynamicContentMapper.java

@@ -45,7 +45,7 @@ public interface DynamicContentMapper extends BaseMapper<DynamicContent> {
   @Update("update dynamic_content set platform_status = #{type} where id = #{id}")
   int shieldById(@Param("id")Long id, @Param("type")int type);
 
-  @Update("update dynamic_content set platform_status = #{type} where is_deleted = 0 and user_id = #{userId}")
+  @Update("update dynamic_content set platform_status = #{type} where deleted = 0 and user_id = #{userId}")
   int shieldByUserId(@Param("userId")Long userId, @Param("type")int type);
 
   IPage<DynamicContentDTO> selectAttention(@Param("page") Page<DynamicContentDTO> page, @Param(Constants.WRAPPER) QueryWrapper<DynamicContent> queryWrapper, @Param("userId") Long userId);

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/CommentService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.chelvc.cloud.vehicle.api.dto.CommentDTO;
 import com.chelvc.cloud.vehicle.api.param.CommentQueryParam;
 import com.chelvc.cloud.vehicle.server.entity.Comment;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 
 import java.util.List;
 
@@ -36,4 +38,6 @@ public interface CommentService extends IService<Comment> {
      * @param userId 用户id
      */
     void changeCommentInformFlag(Long userId);
+
+    Pagination<CommentDTO> selectCommentListByUserId(Long userId, Paging paging);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicCommentService.java

@@ -1,13 +1,12 @@
 package com.chelvc.cloud.vehicle.server.service;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chelvc.cloud.vehicle.api.constant.ExamineType;
 import com.chelvc.cloud.vehicle.api.dto.DynamicCommentDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicCommentParam;
 import com.chelvc.cloud.vehicle.api.param.QueryAdminDynamicParam;
 import com.chelvc.cloud.vehicle.api.param.QueryDynamicCommentParam;
-import com.chelvc.framework.common.model.PagedVO;
+import com.chelvc.framework.common.model.Pagination;
 
 /**
  * 动态评论Service接口
@@ -20,12 +19,12 @@ public interface DynamicCommentService {
     /**
      * 查询动态评论列表
      */
-    IPage<DynamicCommentDTO> queryPageList(QueryDynamicCommentParam param, Integer pageNum, Integer pageSize);
+    Pagination<DynamicCommentDTO> queryPageList(QueryDynamicCommentParam param, Integer pageNum, Integer pageSize);
 
     /**
      * 查询动态信息列表
      */
-    PagedVO<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
+    Pagination<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
                                                   Long pageSize);
 
     /**
@@ -67,4 +66,9 @@ public interface DynamicCommentService {
      * @date 2023/9/12 17:25
      */
     void autoAudit(Long id, int platformStatus, int examineResult);
+
+    /**
+     * 查询评论信息
+     */
+    DynamicCommentDTO queryById(Long id);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicContentService.java

@@ -1,12 +1,11 @@
 package com.chelvc.cloud.vehicle.server.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chelvc.cloud.vehicle.api.constant.ExamineType;
 import com.chelvc.cloud.vehicle.api.dto.DynamicContentDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicContentParam;
 import com.chelvc.cloud.vehicle.api.param.QueryAdminDynamicParam;
 import com.chelvc.cloud.vehicle.api.param.QueryDynamicContentParam;
-import com.chelvc.framework.common.model.PagedVO;
+import com.chelvc.framework.common.model.Pagination;
 
 import java.util.Map;
 
@@ -26,19 +25,19 @@ public interface DynamicContentService {
   /**
    * 查询动态信息列表
    */
-  IPage<DynamicContentDTO> queryPageList(QueryDynamicContentParam param, Integer pageNum,
-                                         Integer pageSize, Long userId);
+  Pagination<DynamicContentDTO> queryPageList(QueryDynamicContentParam param, Integer pageNum,
+                                              Integer pageSize, Long userId);
 
   /**
    * 查询动态信息列表
    */
-  PagedVO<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
+  Pagination<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
                                                 Long pageSize);
 
   /**
    * 查询动态信息列表
    */
-  IPage<DynamicContentDTO> queryUserById(Long selfUserId, Long userId, Integer pageNum, Integer pageSize);
+  Pagination<DynamicContentDTO> queryUserById(Long selfUserId, Long userId, Integer pageNum, Integer pageSize);
 
   /**
    * 修改动态信息

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicEvaluateRecordService.java

@@ -2,7 +2,10 @@ package com.chelvc.cloud.vehicle.server.service;
 
 
 import com.chelvc.cloud.vehicle.api.dto.DynamicEvaluateRecordDTO;
+import com.chelvc.cloud.vehicle.api.dto.EvaluateDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicEvaluateRecordParam;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 
 /**
  * 内容评价(点赞/踩)列Service接口
@@ -32,4 +35,6 @@ public interface DynamicEvaluateRecordService {
      * @param userId 用户id
      */
     void changeEvaluateInformFlag(Long userId);
+
+    Pagination<EvaluateDTO> selectEvaluateListByUserId(Long userId, Paging paging);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/UserCouponService.java

@@ -1,7 +1,10 @@
 package com.chelvc.cloud.vehicle.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.chelvc.cloud.vehicle.api.dto.UserCouponDTO;
 import com.chelvc.cloud.vehicle.server.entity.UserCoupon;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 
 /**
  * 优惠券领取业务操作接口
@@ -24,4 +27,6 @@ public interface UserCouponService extends IService<UserCoupon> {
      * @param userId 用户id
      */
     void changeUserCouponInformFlag(Long userId);
+
+    Pagination<UserCouponDTO> selectUserCouponListByUserId(Long userId, Paging paging);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CommentServiceImpl.java

@@ -3,6 +3,7 @@ package com.chelvc.cloud.vehicle.server.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.uc.api.dto.UserDTO;
 import com.chelvc.cloud.uc.api.service.UserService;
@@ -11,6 +12,10 @@ import com.chelvc.cloud.vehicle.api.param.CommentQueryParam;
 import com.chelvc.cloud.vehicle.server.dao.CommentMapper;
 import com.chelvc.cloud.vehicle.server.entity.Comment;
 import com.chelvc.cloud.vehicle.server.service.CommentService;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
+import com.chelvc.framework.common.util.BeanCopyUtil;
+import com.chelvc.framework.database.util.PagingUtils;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -63,4 +68,14 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         lwq.set(Comment::getFlag, 1);
         baseMapper.update(null, lwq);
     }
+
+    @Override
+    public Pagination<CommentDTO> selectCommentListByUserId(Long userId, Paging paging) {
+        Page<Comment> page = this.lambdaQuery()
+                .eq(Comment::getUserId, userId)
+                .orderByAsc(Comment::getCreateTime).page(PagingUtils.convert(paging));
+        List<Comment> comments = page.getRecords();
+        List<CommentDTO> copy = BeanCopyUtil.copy(comments, CommentDTO.class);
+        return PagingUtils.convert(page, copy);
+    }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicCommentServiceImpl.java

@@ -20,12 +20,13 @@ import com.chelvc.cloud.vehicle.server.entity.DynamicComment;
 import com.chelvc.cloud.vehicle.server.service.DynamicCommentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicContentService;
 import com.chelvc.framework.base.exception.ResourceUnavailableException;
-import com.chelvc.framework.common.model.PagedVO;
+import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.util.BeanCopyUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +47,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.DynamicCommentService.class)
 public class DynamicCommentServiceImpl implements DynamicCommentService, com.chelvc.cloud.vehicle.api.service.DynamicCommentService {
   private final DynamicCommentMapper baseMapper;
   private final DynamicContentService dynamicContentService;
@@ -57,8 +59,8 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
    * 查询动态评论列表
    */
   @Override
-  public IPage<DynamicCommentDTO> queryPageList(QueryDynamicCommentParam param, Integer pageNum,
-                                                Integer pageSize) {
+  public Pagination<DynamicCommentDTO> queryPageList(QueryDynamicCommentParam param, Integer pageNum,
+                                                     Integer pageSize) {
     LambdaQueryWrapper<DynamicComment> lqw = Wrappers.lambdaQuery();
     lqw.eq(DynamicComment::getDynamicId, param.getDynamicId());
     lqw.eq(DynamicComment::getParentId, param.getParentId());
@@ -70,7 +72,6 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
             .eq(DynamicComment::getExamineStatus, 0)
             .eq(DynamicComment::getUserId, userId)));
     lqw.orderByDesc(DynamicComment::getCreateTime);
-    IPage<DynamicCommentDTO> resultPage = new Page<>(pageNum, pageSize);
     Page<DynamicComment> page = baseMapper.selectPage(
         new Page<>(pageNum, pageSize), lqw);
     List<DynamicComment> result = page.getRecords();
@@ -83,29 +84,25 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
       records.forEach(e -> {
         e.setUserDTO(map == null ? new UserDTO() : map.get(e.getUserId()));
       });
-      resultPage.setRecords(records);
-      resultPage.setTotal(page.getTotal());
+      return Pagination.<DynamicCommentDTO>builder().total(page.getTotal()).pages(page.getPages())
+              .records(records).build();
     }
-    return resultPage;
+    return new Pagination<>();
   }
 
   @Override
-  public PagedVO<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
+  public Pagination<DynamicCommentDTO> queryAdminPageList(QueryAdminDynamicParam param, Long pageNum,
                                                        Long pageSize) {
     Page<DynamicCommentDTO> page = new Page<>(pageNum, pageSize);
     IPage<DynamicCommentDTO> result = null;
     if (param == null) {
-      return PagedVO.build(page, DynamicCommentDTO.class);
+      return new Pagination<>();
     }
     result = baseMapper
         .queryAll(page, queryManagerWrapper(param));
     IPage<DynamicCommentDTO> resultDto = getResult(result);
-    PagedVO<DynamicCommentDTO> vo = new PagedVO<>();
-    vo.setPageSize(pageSize);
-    vo.setPageNumber(pageNum);
-    vo.setRecords(resultDto.getRecords());
-    vo.setTotalNumber(result.getTotal());
-    return vo;
+    return Pagination.<DynamicCommentDTO>builder().total(result.getTotal()).pages(result.getPages())
+            .records(resultDto.getRecords()).build();
   }
 
   public IPage<DynamicCommentDTO> getResult(IPage<DynamicCommentDTO> result) {
@@ -131,17 +128,14 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
   private QueryWrapper<DynamicComment> queryManagerWrapper(
       QueryAdminDynamicParam param) {
     QueryWrapper<DynamicComment> lqw = Wrappers.query();
-    lqw.eq("t1.is_deleted", 0);
+    lqw.eq("t1.deleted", 0);
     lqw.like(StringUtils.isNotBlank(param.getKeyWord()), "t1.content", param.getKeyWord());
     lqw.ge(StringUtils.isNotBlank(param.getStartTime()), "t1.create_time", param.getStartTime());
     lqw.le(StringUtils.isNotBlank(param.getEndTime()), "t1.create_time", param.getEndTime());
     lqw.eq(param.getExamineStatus() != null, "t1.examine_status", param.getExamineStatus());
     lqw.eq(param.getExamineResult() != null, "t1.examine_result", param.getExamineResult());
     lqw.eq(param.getPlatformStatus() != null, "t1.platform_status", param.getPlatformStatus());
-    List<String> list = new ArrayList<>();
-    list.add("t1.create_time");
-    list.add("t1.id");
-    lqw.orderByDesc(list.toString());
+    lqw.orderByDesc("t1.create_time","t1.id");
     return lqw;
   }
 
@@ -248,4 +242,13 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
       dynamicContentService.addComment(DynamicComment.getDynamicId());
     }
   }
+
+  @Override
+  public DynamicCommentDTO queryById(Long id) {
+    DynamicComment dynamicComment = baseMapper.selectById(id);
+    if(dynamicComment == null){
+      return null;
+    }
+    return BeanCopyUtil.copy(dynamicComment, DynamicCommentDTO.class);
+  }
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicContentServiceImpl.java

@@ -26,11 +26,12 @@ import com.chelvc.cloud.vehicle.server.service.DynamicContentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicEvaluateRecordService;
 import com.chelvc.cloud.vehicle.server.service.DynamicResourceService;
 import com.chelvc.framework.base.exception.ResourceUnavailableException;
-import com.chelvc.framework.common.model.PagedVO;
+import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +52,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.DynamicContentService.class)
 public class DynamicContentServiceImpl implements DynamicContentService, com.chelvc.cloud.vehicle.api.service.DynamicContentService {
   private final DynamicContentMapper baseMapper;
   @DubboReference
@@ -91,8 +93,8 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
   }
 
   @Override
-  public IPage<DynamicContentDTO> queryPageList(QueryDynamicContentParam param, Integer pageNum,
-                                                Integer pageSize, Long userId) {
+  public Pagination<DynamicContentDTO> queryPageList(QueryDynamicContentParam param, Integer pageNum,
+                                                     Integer pageSize, Long userId) {
     String keyWord = param.getKeyWord();
     Integer type = param.getType().getValue();
     Page<DynamicContentDTO> page = new Page<>(pageNum, pageSize);
@@ -109,7 +111,9 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
       result = baseMapper
           .queryRandom(page, queryRandomWrapper(keyWord, userId));
     }
-    return getResult(result, true, userId);
+    result = getResult(result, true, userId);
+    return Pagination.<DynamicContentDTO>builder().total(result.getTotal()).pages(result.getPages())
+            .records(result.getRecords()).build();
   }
 
   public IPage<DynamicContentDTO> getResult(IPage<DynamicContentDTO> result, boolean b, Long selfUserId) {
@@ -151,23 +155,20 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
   }
 
   public QueryWrapper<DynamicContent> queryAttentionWrapper(String keyWord) {
-    List<String> list = new ArrayList<>();
     QueryWrapper<DynamicContent> lqw = Wrappers.query();
-    lqw.eq("t1.is_deleted", 0);
+    lqw.eq("t1.deleted", 0);
     lqw.eq("t1.platform_status", 0);
     lqw.like(StringUtils.isNotBlank(keyWord), "t1.text_content", keyWord);
     lqw.eq("t1.status", 0);
     lqw.inSql("t1.user_id",
         "SELECT t2.target FROM collision_user.user_attention t2 WHERE t2.user_id = #{userId}");
-    list.add("t1.create_time");
-    list.add("t1.id");
-    lqw.orderByDesc(list.toString());
+    lqw.orderByDesc("t1.create_time","t1.id");
     return lqw;
   }
 
   public QueryWrapper<DynamicContent> queryRandomWrapper(String keyWord, Long userId) {
     QueryWrapper<DynamicContent> lqw = Wrappers.query();
-    lqw.eq("t1.is_deleted", 0);
+    lqw.eq("t1.deleted", 0);
     lqw.eq("t1.platform_status", 0);
     lqw.like(StringUtils.isNotBlank(keyWord), "t1.text_content", keyWord);
     lqw.and(wq -> wq
@@ -186,7 +187,7 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
 
   public QueryWrapper<DynamicContent> format(QueryWrapper<DynamicContent> lqw,
       String keyWord, Long userId) {
-    lqw.eq("t1.is_deleted", 0);
+    lqw.eq("t1.deleted", 0);
     lqw.eq("t1.platform_status", 0);
     lqw.and(wq -> wq
         .eq("t1.examine_status", 1)
@@ -199,51 +200,41 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
             .eq("t1.status", 1)
             .eq("t1.user_id", userId)));
     lqw.like(StringUtils.isNotBlank(keyWord), "t1.text_content", keyWord);
-    List<String> list = new ArrayList<>();
-    list.add("t1.create_time");
-    list.add("t1.id");
-    lqw.orderByDesc(list.toString());
+    lqw.orderByDesc("t1.create_time","t1.id");
     return lqw;
   }
 
   @Override
-  public PagedVO<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param,
+  public Pagination<DynamicContentDTO> queryAdminPageList(QueryAdminDynamicParam param,
                                                           Long pageNum, Long pageSize) {
     Page<DynamicContentDTO> page = new Page<>(pageNum, pageSize);
     IPage<DynamicContentDTO> result = null;
     if (param == null) {
-      return PagedVO.build(page, DynamicContentDTO.class);
+      return new Pagination<>();
     }
     result = baseMapper
         .queryAll(page, queryManagerWrapper(param));
     IPage<DynamicContentDTO> resultDto = getResult(result, false, null);
-    PagedVO<DynamicContentDTO> vo = new PagedVO<>();
-    vo.setPageSize(pageSize);
-    vo.setPageNumber(pageNum);
-    vo.setRecords(resultDto.getRecords());
-    vo.setTotalNumber(result.getTotal());
-    return vo;
+    return Pagination.<DynamicContentDTO>builder().total(result.getTotal()).pages(result.getPages())
+            .records(resultDto.getRecords()).build();
   }
 
   private QueryWrapper<DynamicContent> queryManagerWrapper(
       QueryAdminDynamicParam param) {
     QueryWrapper<DynamicContent> lqw = Wrappers.query();
-    lqw.eq("t1.is_deleted", 0);
+    lqw.eq("t1.deleted", 0);
     lqw.like(StringUtils.isNotBlank(param.getKeyWord()), "t1.text_content", param.getKeyWord());
     lqw.ge(StringUtils.isNotBlank(param.getStartTime()), "t1.create_time", param.getStartTime());
     lqw.le(StringUtils.isNotBlank(param.getEndTime()), "t1.create_time", param.getEndTime());
     lqw.eq(param.getExamineStatus() != null, "t1.examine_status", param.getExamineStatus());
     lqw.eq(param.getExamineResult() != null, "t1.examine_result", param.getExamineResult());
     lqw.eq(param.getPlatformStatus() != null, "t1.platform_status", param.getPlatformStatus());
-    List<String> list = new ArrayList<>();
-    list.add("t1.create_time");
-    list.add("t1.id");
-    lqw.orderByDesc(list.toString());
+    lqw.orderByDesc("t1.create_time","t1.id");
     return lqw;
   }
 
   @Override
-  public IPage<DynamicContentDTO> queryUserById(Long selfUserId, Long userId, Integer pageNum, Integer pageSize) {
+  public Pagination<DynamicContentDTO> queryUserById(Long selfUserId, Long userId, Integer pageNum, Integer pageSize) {
     if (userId == null) {
       return null;
     }
@@ -255,20 +246,19 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
     //flag: 1-查看其他人；2-查看自己
     IPage<DynamicContentDTO> iPage = baseMapper
         .queryBySelf(page, querySelfWrapper(flag, userId));
-    return getResult(iPage, true, userId);
+    IPage<DynamicContentDTO> result = getResult(iPage, true, userId);
+    return Pagination.<DynamicContentDTO>builder().total(result.getTotal()).pages(result.getPages())
+            .records(result.getRecords()).build();
   }
 
   public QueryWrapper<DynamicContent> querySelfWrapper(int flag, Long userId) {
-    List<String> list = new ArrayList<>();
     QueryWrapper<DynamicContent> lqw = Wrappers.query();
-    lqw.eq("t1.is_deleted", 0);
+    lqw.eq("t1.deleted", 0);
     lqw.eq("t1.user_id", userId);
     lqw.eq("t1.platform_status", 0);
     lqw.eq(flag == 1, "t1.status", 0);
     lqw.eq(flag == 1, "t1.examine_status", 1);
-    list.add("t1.create_time");
-    list.add("t1.id");
-    lqw.orderByDesc(list.toString());
+    lqw.orderByDesc("t1.create_time","t1.id");
     return lqw;
   }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicEvaluateRecordServiceImpl.java

@@ -3,9 +3,13 @@ package com.chelvc.cloud.vehicle.server.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.api.constant.ActionType;
 import com.chelvc.cloud.vehicle.api.constant.RecordType;
+import com.chelvc.cloud.vehicle.api.dto.DynamicCommentDTO;
 import com.chelvc.cloud.vehicle.api.dto.DynamicEvaluateRecordDTO;
+import com.chelvc.cloud.vehicle.api.dto.EvaluateDTO;
 import com.chelvc.cloud.vehicle.api.param.AddDynamicEvaluateRecordParam;
 import com.chelvc.cloud.vehicle.server.dao.DynamicEvaluateRecordMapper;
 import com.chelvc.cloud.vehicle.server.entity.DynamicEvaluateRecord;
@@ -13,7 +17,10 @@ import com.chelvc.cloud.vehicle.server.service.DynamicCommentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicContentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicEvaluateRecordService;
 import com.chelvc.framework.base.exception.ResourceUnavailableException;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 import com.chelvc.framework.common.util.BeanCopyUtil;
+import com.chelvc.framework.database.util.PagingUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +40,7 @@ import java.util.Objects;
 @Slf4j
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
-public class DynamicEvaluateRecordServiceImpl implements DynamicEvaluateRecordService {
+public class DynamicEvaluateRecordServiceImpl extends ServiceImpl<DynamicEvaluateRecordMapper, DynamicEvaluateRecord> implements DynamicEvaluateRecordService {
 
   private final DynamicEvaluateRecordMapper baseMapper;
 
@@ -112,6 +119,30 @@ public class DynamicEvaluateRecordServiceImpl implements DynamicEvaluateRecordSe
     baseMapper.update(null, lwq);
   }
 
+  @Override
+  public Pagination<EvaluateDTO> selectEvaluateListByUserId(Long userId, Paging paging) {
+    Page<DynamicEvaluateRecord> page = this.lambdaQuery()
+            .eq(DynamicEvaluateRecord::getTargetUserId, userId)
+            .orderByAsc(DynamicEvaluateRecord::getCreateTime).page(PagingUtils.convert(paging));
+    List<DynamicEvaluateRecord> dynamicEvaluateRecords = page.getRecords();
+    List<EvaluateDTO> copy = BeanCopyUtil.copy(dynamicEvaluateRecords, EvaluateDTO.class);
+    if(copy != null && copy.size() > 0){
+      for (EvaluateDTO evaluateDTO : copy) {
+        Integer contentType = evaluateDTO.getContentType();
+        if(contentType == 1){
+            evaluateDTO.setDynamicContentDTO(iDynamicContentService.queryById(evaluateDTO.getContentId(), evaluateDTO.getUserId()));
+        } else {
+          DynamicCommentDTO dynamicCommentDTO = iDynamicCommentService.queryById(evaluateDTO.getContentId());
+          if(dynamicCommentDTO != null){
+            evaluateDTO.setDynamicContentDTO(iDynamicContentService.queryById(dynamicCommentDTO.getDynamicId(), evaluateDTO.getUserId()));
+          }
+          evaluateDTO.setDynamicCommentDTO(dynamicCommentDTO);
+        }
+      }
+    }
+    return PagingUtils.convert(page, copy);
+  }
+
   /**
    * 判断该用户是否有点赞/踩记录，点击新增记录，取消删除记录
    * @param lqw

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/InformServiceImpl.java

@@ -10,11 +10,13 @@ import com.chelvc.cloud.vehicle.server.service.OmsOrderPayHistoryService;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.InformService.class)
 public class InformServiceImpl implements InformService {
 
     private final IOmsOrderOperateHistoryService omsOrderOperateHistoryService;
@@ -64,8 +66,8 @@ public class InformServiceImpl implements InformService {
     }
 
     @Override
-    public Pagination<OmsOrderPayHistoryDTO> selectEvaluateListByUserId(Long userId, Paging paging) {
-        return null;
+    public Pagination<EvaluateDTO> selectEvaluateListByUserId(Long userId, Paging paging) {
+        return dynamicEvaluateRecordService.selectEvaluateListByUserId(userId, paging);
     }
 
     @Override
@@ -75,7 +77,7 @@ public class InformServiceImpl implements InformService {
 
     @Override
     public Pagination<CommentDTO> selectCommentListByUserId(Long userId, Paging paging) {
-        return null;
+        return commentService.selectCommentListByUserId(userId, paging);
     }
 
     @Override
@@ -85,7 +87,7 @@ public class InformServiceImpl implements InformService {
 
     @Override
     public Pagination<UserCouponDTO> selectUserCouponListByUserId(Long userId, Paging paging) {
-        return null;
+        return userCouponService.selectUserCouponListByUserId(userId, paging);
     }
 
     @Override

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserCouponServiceImpl.java

@@ -23,6 +23,8 @@ import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.exception.ResourceUnavailableException;
 import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
+import com.chelvc.framework.common.util.BeanCopyUtil;
 import com.chelvc.framework.database.util.PagingUtils;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
@@ -160,6 +162,16 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
         baseMapper.update(null, lwq);
     }
 
+    @Override
+    public Pagination<UserCouponDTO> selectUserCouponListByUserId(Long userId, Paging paging) {
+        Page<UserCoupon> page = this.lambdaQuery()
+                .eq(UserCoupon::getUserId, userId)
+                .orderByAsc(UserCoupon::getCreateTime).page(PagingUtils.convert(paging));
+        List<UserCoupon> userCoupons = page.getRecords();
+        List<UserCouponDTO> copy = BeanCopyUtil.copy(userCoupons, UserCouponDTO.class);
+        return PagingUtils.convert(page, copy);
+    }
+
     /**
      * 检查该用户可领取的优惠券的数量
      *

vehicle-server/src/main/resources/mapper/DynamicCommentMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chelvc.cloud.vehicle.server.dao.DynamicCommentMapper">
+
+    <resultMap type="com.chelvc.cloud.vehicle.api.dto.DynamicCommentDTO" id="ContentDynamicResult">
+    <result property="id" column="id"/>
+    <result property="userId" column="user_id"/>
+    <result property="dynamicId" column="dynamic_id"/>
+    <result property="content" column="content"/>
+    <result property="commentNum" column="comment_num"/>
+    <result property="goodNum" column="good_num"/>
+    <result property="badNum" column="bad_num"/>
+    <result property="status" column="status"/>
+    <result property="platformStatus" column="platform_status"/>
+    <result property="examineStatus" column="examine_status"/>
+    <result property="examineResult" column="examine_result"/>
+    <result property="createTime" column="create_time"/>
+    <collection property="resourceVos" javaType="ArrayList" column="id"
+                select="getResourceById" ofType="net.yeeu.collision.dynamic.dto.DynamicResourceDTO">
+    </collection>
+    </resultMap>
+
+    <select id="getResourceById" resultType="com.chelvc.cloud.vehicle.api.dto.DynamicResourceDTO">
+        select t3.*
+        from dynamic_resource t3
+        where t3.dynamic_id = #{id}
+    </select>
+
+    <select id="queryAll" parameterType="java.lang.Long" resultMap="ContentDynamicResult">
+        SELECT
+        t1.*
+        FROM
+        dynamic_comment t1
+        ${ew.getCustomSqlSegment}
+    </select>
+</mapper>

vehicle-server/src/main/resources/mapper/DynamicContentMapper.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chelvc.cloud.vehicle.server.dao.DynamicContentMapper">
+
+    <resultMap type="com.chelvc.cloud.vehicle.api.dto.DynamicContentDTO" id="ContentDynamicResult">
+    <result property="id" column="id"/>
+    <result property="userId" column="user_id"/>
+    <result property="textContent" column="text_content"/>
+    <result property="commentNum" column="comment_num"/>
+    <result property="goodNum" column="good_num"/>
+    <result property="badNum" column="bad_num"/>
+    <result property="status" column="status"/>
+    <result property="platformStatus" column="platform_status"/>
+    <result property="examineStatus" column="examine_status"/>
+    <result property="examineResult" column="examine_result"/>
+    <result property="location" column="location"/>
+    <result property="type" column="type"/>
+    <result property="createTime" column="create_time"/>
+    <collection property="resourceVos" javaType="ArrayList" column="id"
+                select="getResourceById" ofType="com.chelvc.cloud.vehicle.api.dto.DynamicResourceDTO">
+    </collection>
+    </resultMap>
+
+    <select id="getResourceById" resultType="com.chelvc.cloud.vehicle.api.dto.DynamicResourceDTO">
+        select t3.*
+        from dynamic_resource t3
+        where t3.dynamic_id = #{id}
+    </select>
+
+    <select id="queryById" resultMap="ContentDynamicResult" parameterType="java.lang.Long">
+        select t1.*
+        from dynamic_content t1
+        where t1.id = #{id}
+    </select>
+
+    <select id="selectAttention" parameterType="java.lang.Long" resultMap="ContentDynamicResult">
+        SELECT
+            t1.*
+        FROM
+            dynamic_content t1
+            ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="queryAll" parameterType="java.lang.Long" resultMap="ContentDynamicResult">
+        SELECT
+        t1.*
+        FROM
+        dynamic_content t1
+        ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="queryHot" parameterType="java.lang.Long" resultMap="ContentDynamicResult">
+        SELECT
+        t1.*
+        FROM
+        dynamic_content t1
+        ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="queryBySelf" resultMap="ContentDynamicResult">
+        SELECT
+        t1.*
+        FROM
+        dynamic_content t1
+        ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="queryRandom" resultMap="ContentDynamicResult">
+        SELECT
+            t1.*
+        FROM
+            dynamic_content t1
+            ${ew.getCustomSqlSegment}
+            ORDER BY RAND()
+    </select>
+</mapper>