diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java index 738fa9c..d77c221 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/BizMessageMapper.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.bizmessage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageAuthorize; import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessageVo; @@ -13,7 +14,10 @@ public interface BizMessageMapper extends BaseMapper { IPage findMessage(@Param("param") IPage page, @Param("userId") String userId); - IPage findMessageVo(@Param("param") IPage page, @Param("userId") String userId,@Param("templatecodes") List templatecodes); + IPage findMessageVo(@Param("param") IPage page, + @Param("userId") String userId, + @Param("templatecodes") List templatecodes, + @Param("po") PageDTO pageDTO); Boolean updateState(@Param("userId") String userId,@Param("messageId") String messageId); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml index 486b164..71998c3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dao/mapper/BizMessageMapper.xml @@ -19,10 +19,21 @@ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java index 3c7fae0..ab0208d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/dto/PageDTO.java @@ -31,4 +31,16 @@ public class PageDTO { @ApiModelProperty(required = false, value = "指定消息类型,null 查全部") private List templatecodes; + /** + * 标题 + */ + private String title; + /** + * 类型 + */ + private String templatetype; + /** + * 0 未读取 1 已读取 + */ + private String state; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java index 8db6a00..0021ae3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java @@ -44,7 +44,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService page = createPageCondition(page); IPage pageEntity = new Page(page.getPageNo(), page.getPageSize()); - pageEntity = mapper.findMessageVo(pageEntity,service.getCacheUser().getUserId(),page.getTemplatecodes()); + pageEntity = mapper.findMessageVo(pageEntity,service.getCacheUser().getUserId(),page.getTemplatecodes(),page); // DAT -> VO 转换 IBizMessagePage result = new BizMessagePage<>();