diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java index 1dae47d7..0ca41606 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java @@ -1,6 +1,7 @@ package cn.lili.controller.member; import cn.lili.common.enums.ResultUtil; +import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.message.entity.enums.MessageStatusEnum; @@ -34,21 +35,23 @@ public class MemberMessageBuyerController { @ApiOperation(value = "分页获取会员站内消息") @GetMapping public ResultMessage> page(MemberMessageQueryVO memberMessageQueryVO, PageVO page) { + memberMessageQueryVO.setMemberId(UserContext.getCurrentUser().getId()); return ResultUtil.data(memberMessageService.getPage(memberMessageQueryVO, page)); } @ApiOperation(value = "消息已读") @ApiImplicitParam(name = "messageId", value = "会员消息id", required = true, paramType = "path") - @PutMapping - public ResultMessage read(@PathVariable String messageId) { + @PutMapping("/{message_id}") + public ResultMessage read(@PathVariable("message_id") String messageId) { return ResultUtil.data(memberMessageService.editStatus(MessageStatusEnum.ALREADY_READY.name(), messageId)); } - @ApiOperation(value = "消息删除") + @ApiOperation(value = "消息放入回收站") @ApiImplicitParam(name = "messageId", value = "会员消息id", required = true, paramType = "path") - @DeleteMapping - public ResultMessage deleteMessage(@PathVariable String messageId) { - return ResultUtil.data(memberMessageService.deleteMessage(messageId)); + @DeleteMapping("/{message_id}") + public ResultMessage deleteMessage(@PathVariable("message_id") String messageId) { + return ResultUtil.data(memberMessageService.editStatus(MessageStatusEnum.ALREADY_REMOVE.name(), messageId)); + } diff --git a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java index 01433f64..659c1c53 100644 --- a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java @@ -148,7 +148,7 @@ public class NoticeSendMessageListener implements RocketMQListener { Integer memberNum = memberService.getMemberNum(memberSearchVO); //构建分页查询参数 //100条查一次 - Integer pageSize = 200; + Integer pageSize = 100; Integer pageCount = 0; pageCount = memberNum / pageSize; pageCount = memberNum % pageSize > 0 ? pageCount + 1 : pageCount; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java index 378e35b6..4ccb3fdd 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java @@ -43,7 +43,7 @@ public class MemberMessage extends BaseEntity { /** * @see MessageStatusEnum */ - @ApiModelProperty(value = "状态 0默认未读 1已读 2回收站") + @ApiModelProperty(value = "状态") private String status = MessageStatusEnum.UN_READY.name(); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java index 7b9a78ae..e5dfed67 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java @@ -31,13 +31,15 @@ public class MemberMessageServiceImpl extends ServiceImpl getPage(MemberMessageQueryVO memberMessageQueryVO, PageVO pageVO) { QueryWrapper queryWrapper = new QueryWrapper<>(); //消息id - queryWrapper.like(StringUtils.isNotEmpty(memberMessageQueryVO.getMessageId()), "message_id", memberMessageQueryVO.getMessageId()); + queryWrapper.eq(StringUtils.isNotEmpty(memberMessageQueryVO.getMessageId()), "message_id", memberMessageQueryVO.getMessageId()); //消息标题 queryWrapper.like(StringUtils.isNotEmpty(memberMessageQueryVO.getTitle()), "title", memberMessageQueryVO.getTitle()); //会员id - queryWrapper.like(StringUtils.isNotEmpty(memberMessageQueryVO.getMemberId()), "member_id", memberMessageQueryVO.getMemberId()); + queryWrapper.eq(StringUtils.isNotEmpty(memberMessageQueryVO.getMemberId()), "member_id", memberMessageQueryVO.getMemberId()); //消息状态 - queryWrapper.like(StringUtils.isNotEmpty(memberMessageQueryVO.getStatus()), "status", memberMessageQueryVO.getStatus()); + queryWrapper.eq(StringUtils.isNotEmpty(memberMessageQueryVO.getStatus()), "status", memberMessageQueryVO.getStatus()); + //倒序 + queryWrapper.orderByDesc("create_time"); //构建查询 return this.page(PageUtil.initPage(pageVO), queryWrapper); }