From 34c7d903efa4dc06a0f7b38bc5d2d721f80b220d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 09 七月 2025 09:04:52 +0800
Subject: [PATCH] 7.8冒烟修改问题
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/messageController.java | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/messageController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/messageController.java
index 589a24c..0d8bd16 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/messageController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/messageController.java
@@ -11,6 +11,7 @@
import com.ruoyi.system.model.TbUser;
import com.ruoyi.system.query.UserMessageQuery;
import com.ruoyi.system.service.TbMessageService;
+import com.ruoyi.system.service.TbOrderService;
import com.ruoyi.system.service.TbUserService;
import com.ruoyi.system.vo.InviteUserListVo;
import io.swagger.annotations.Api;
@@ -21,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
+import java.util.List;
@Slf4j
@RestController
@@ -37,12 +39,22 @@
@Autowired
private TokenService tokenService;
+ @Autowired
+ private TbOrderService orderService;
+
+
@ApiOperation(value = "获取用户消息",tags = {"消息模块"})
@GetMapping("/getUserMessage")
public R<Page<TbMessage>> getUserMessage(UserMessageQuery query) {
LoginUser loginUser = tokenService.getLoginUser();
Long userId = loginUser.getUserId();
- Page<TbMessage> page = messageService.page(new Page<>(query.getPageNum(), query.getPageSize()), new LambdaQueryWrapper<TbMessage>().eq(TbMessage::getUserId, userId));
+ Page<TbMessage> page = messageService.page(new Page<>(query.getPageNum(), query.getPageSize()), new LambdaQueryWrapper<TbMessage>().eq(query.getIsRead()!=null, TbMessage::getIsRead, query.getIsRead()).eq(TbMessage::getUserId, userId).orderByDesc(TbMessage::getCreateTime));
+ page.getRecords().forEach(item -> {
+ String companyId = orderService.getById(item.getOrderId()).getCompanyId();
+ item.setCompanyId(companyId);
+ });
+ long count = messageService.count(new LambdaQueryWrapper<TbMessage>().eq(TbMessage::getIsRead, 0).eq(TbMessage::getUserId, userId));
+ page.setCurrent(count);
return R.ok(page);
}
@@ -74,28 +86,28 @@
- @ApiOperation(value = "分享有礼列表",tags = {"分享有礼列表"})
- @GetMapping("/getInviteUserList")
- public R<Page<InviteUserListVo>> getInviteUserList(BasePage page) {
- LoginUser loginUser = tokenService.getLoginUser();
- Long userId = loginUser.getUserId();
- Page<TbUser> page1 = userService.page(new Page<>(page.getPageNum(), page.getPageSize()), new LambdaQueryWrapper<TbUser>().eq(TbUser::getInviteId, userId).orderByDesc(TbUser::getCreateTime));
- Page<InviteUserListVo> inviteUserListVoPage = new Page<>();
- if(page1.getRecords().isEmpty()){
- return R.ok(inviteUserListVoPage);
- }
- ArrayList<InviteUserListVo> inviteUserListVos = new ArrayList<>();
- for (TbUser record : page1.getRecords()) {
- InviteUserListVo inviteUserListVo = new InviteUserListVo();
- inviteUserListVo.setUsername(record.getUserName());
- inviteUserListVo.setCreateTime(record.getCreateTime());
- inviteUserListVo.setInviteNum(record.getInviteNum());
- inviteUserListVos.add(inviteUserListVo);
- }
- BeanUtils.copyProperties(page1,inviteUserListVoPage);
- inviteUserListVoPage.setRecords(inviteUserListVos);
- return R.ok(inviteUserListVoPage);
- }
+// @ApiOperation(value = "分享有礼列表",tags = {"分享有礼列表"})
+// @GetMapping("/getInviteUserList")
+// public R<Page<InviteUserListVo>> getInviteUserList(BasePage page) {
+// LoginUser loginUser = tokenService.getLoginUser();
+// Long userId = loginUser.getUserId();
+// Page<TbUser> page1 = userService.page(new Page<>(page.getPageNum(), page.getPageSize()), new LambdaQueryWrapper<TbUser>().eq(TbUser::getInviteId, userId).orderByDesc(TbUser::getCreateTime));
+// Page<InviteUserListVo> inviteUserListVoPage = new Page<>();
+// if(page1.getRecords().isEmpty()){
+// return R.ok(inviteUserListVoPage);
+// }
+// ArrayList<InviteUserListVo> inviteUserListVos = new ArrayList<>();
+// for (TbUser record : page1.getRecords()) {
+// InviteUserListVo inviteUserListVo = new InviteUserListVo();
+// inviteUserListVo.setUsername(record.getUserName());
+// inviteUserListVo.setCreateTime(record.getCreateTime());
+// inviteUserListVo.setInviteNum(record.getInviteNum());
+// inviteUserListVos.add(inviteUserListVo);
+// }
+// BeanUtils.copyProperties(page1,inviteUserListVoPage);
+// inviteUserListVoPage.setRecords(inviteUserListVos);
+// return R.ok(inviteUserListVoPage);
+// }
}
--
Gitblit v1.7.1