haotian/wenlvApp
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改--获取新增关注列表返回所有关注数据,同时返回关注消息是否已读状态

Browse Source
This commit is contained in:
haotian 2025-04-14 14:57:14 +08:00
parent 81f1655f5a
commit 9e1abea4da
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
View File

@ -1260,6 +1260,16 @@ public class AppSystemController extends BaseController {
return AjaxResult.success(mchOrderNo);
}
// 关闭订单接口.根据订单号删除订单.
@PostMapping("/closeOrder")
public AjaxResult closeOrder(@RequestParam("mchOrderNo") String mchOrderNo) {
if(! redisCache.hasKey(mchOrderNo)){
return error("订单不存在");
}
return success();
}
// 获取订单列表
@GetMapping("/getOrderList")

10
ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/FollowerListDto.java
View File

@ -12,6 +12,8 @@ public class FollowerListDto {
private String avatar;
private String detail;
private Date createTime;
// 消息已读状态
private String status;
private String followStatus;
public Long getUserId() {
@ -62,5 +64,13 @@ public class FollowerListDto {
this.followStatus = followStatus;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
}

11
ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml
View File

@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="avatar" column="avatar" />
<result property="detail" column="remark" />
<result property="createTime" column="create_time" />
<result property="status" column="status" />
<result property="followStatus" column="follow_status" />
</resultMap>
@ -66,11 +67,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="getAddFollowerList" resultMap="FollowerListDtoResult">
select u.user_id, u.nick_name, u.avatar, u.remark, f.create_time, f.follow_status
from sys_user_follow f
left join sys_user u on f.user_id = u.user_id
left join sys_user_notification n on f.user_id = n.user_id
where f.followed_user_id = #{userId} and n.user_id = #{userId} and n.status = '0' and n.type = '1'
SELECT u.user_id, u.nick_name, u.avatar, u.remark, f.create_time, n.status ,f.follow_status
FROM sys_user_notification n
LEFT JOIN sys_user u ON n.sender_id = u.user_id
LEFT JOIN sys_user_follow f ON n.sender_id = f.user_id
WHERE n.user_id = #{user_id} AND n.type = 1 AND f.followed_user_id = #{user_id}
order by f.create_time desc
</select>