From 9e1abea4da21f25766f28cdc84261c8cd1a81848 Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Mon, 14 Apr 2025 14:57:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E8=8E=B7=E5=8F=96=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=85=B3=E6=B3=A8=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=85=B3=E6=B3=A8=E6=95=B0=E6=8D=AE,?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=BF=94=E5=9B=9E=E5=85=B3=E6=B3=A8=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=98=AF=E5=90=A6=E5=B7=B2=E8=AF=BB=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/app/AppSystemController.java | 10 ++++++++++
 .../com/ruoyi/system/domain/dto/FollowerListDto.java  | 10 ++++++++++
 .../resources/mapper/system/SysUserFollowMapper.xml   | 11 ++++++-----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
index 4e475d5b..35058540 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
@@ -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")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/FollowerListDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/FollowerListDto.java
index ebbce0d6..f9171ea7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/FollowerListDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/FollowerListDto.java
@@ -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;
+    }
+
 
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml
index 27b4aac7..0d46909a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml
@@ -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>