From 2d66f086b9e73930ba20e415a4de4cdad4459424 Mon Sep 17 00:00:00 2001
From: tortoise <2891138827@qq.com>
Date: Mon, 9 Sep 2024 01:14:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=823?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sims/controller/RevokedController.java    | 28 +++++++++++++++++--
 .../sims/mapper/MpRevRequestMapper.java       |  5 ++++
 .../suyiiyii/sims/service/RevokedService.java |  7 +++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/main/java/top/suyiiyii/sims/controller/RevokedController.java b/src/main/java/top/suyiiyii/sims/controller/RevokedController.java
index bcab8d7..23b8bb0 100644
--- a/src/main/java/top/suyiiyii/sims/controller/RevokedController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/RevokedController.java
@@ -48,7 +48,7 @@ public class RevokedController {
     //TODO 普通成员向管理员申请撤销
     @AuthAccess(allowRoles = {"user"})
     @Operation(summary = "成员申请撤销")
-    @PostMapping("/revoked")
+    @PostMapping("")
     public Result<CommonResponse> revoked(@RequestBody Request request) {
 
         if(request.getReason().isBlank()) {
@@ -64,7 +64,7 @@ public class RevokedController {
     //TODO 管理员查看所有撤销申请
     @AuthAccess(allowRoles = {"admin"})
     @Operation(summary = "管理员查看所有撤销申请")
-    @GetMapping("/revoked")
+    @GetMapping("")
     public Result<List<RevokeRequestDto>> revoked(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size) {
@@ -80,7 +80,24 @@ public class RevokedController {
     }
     //TODO 管理员可以撤销某一成员的奖励或惩罚记录，需填写撤销原因，撤销备注
 
+    @AuthAccess(allowRoles = {"admin"})
+    @Operation(summary = "管理员处理撤销申请")
+    @PutMapping("/{id}")
+    public Result<CommonResponse> revoked( @PathVariable Integer id,RevokedRequest revokedRequest) {
+        if(revokedRequest.getAdminRemark().isBlank()) {
+            throw new ServiceException("撤销备注不能为空");
+        }
+        if(!"批准".equals(revokedRequest.getStatus()) && !"拒绝".equals(revokedRequest.getStatus()) ) {
+            throw new ServiceException("状态不合法");
+        }
 
+        revokedService.updateRevokeRequest(id,
+                revokedRequest.getStatus(),revokedRequest.getAdminRemark(),
+                revokedRequest.getReason(),revokedRequest.getHandleTime());
+//TODO 要加到记录里面去
+        return Result.success(CommonResponse.factory("申请成功"));
+
+    }
     @Data
     public static class Request {
         private Integer userId;
@@ -88,4 +105,11 @@ public class RevokedController {
         private String reason;
         private Long requestTime;
     }
+    @Data
+    public static class RevokedRequest {
+        private String status;
+        private String adminRemark;
+        private String reason;
+        private Long handleTime;
+    }
 }
diff --git a/src/main/java/top/suyiiyii/sims/mapper/MpRevRequestMapper.java b/src/main/java/top/suyiiyii/sims/mapper/MpRevRequestMapper.java
index 3104128..01b56b0 100644
--- a/src/main/java/top/suyiiyii/sims/mapper/MpRevRequestMapper.java
+++ b/src/main/java/top/suyiiyii/sims/mapper/MpRevRequestMapper.java
@@ -2,6 +2,7 @@ package top.suyiiyii.sims.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import top.suyiiyii.sims.entity.RevokeRequest;
 
 import java.util.List;
@@ -18,4 +19,8 @@ import java.util.List;
 public interface MpRevRequestMapper extends BaseMapper<RevokeRequest> {
     @Select("select * from revoke_request limit #{page},#{size}")
     List<RevokeRequest> selectList(int page, int size);
+@Update("update revoke_request set status=#{status},admin_remark=#{adminRemark} where id=#{id}")
+    void update(Integer id, String status, String adminRemark);
+@Update("update revoke_request set status=#{status},admin_remark=#{adminRemark},reason=#{reason},handle_time=#{handleTime} where id=#{id}")
+    void update(Integer id, String status, String adminRemark, String reason, Long handleTime);
 }
diff --git a/src/main/java/top/suyiiyii/sims/service/RevokedService.java b/src/main/java/top/suyiiyii/sims/service/RevokedService.java
index 700283b..21f6a35 100644
--- a/src/main/java/top/suyiiyii/sims/service/RevokedService.java
+++ b/src/main/java/top/suyiiyii/sims/service/RevokedService.java
@@ -2,6 +2,7 @@ package top.suyiiyii.sims.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import top.suyiiyii.sims.controller.RevokedController;
 import top.suyiiyii.sims.entity.RevokeRequest;
 import top.suyiiyii.sims.mapper.MpRevRequestMapper;
 
@@ -29,4 +30,10 @@ public class RevokedService {
         public List<RevokeRequest> getAll(int page, int size){
         return mpRevRequestMapper.selectList(page,size);
     }
+
+
+    public void updateRevokeRequest(Integer id, String status, String adminRemark, String reason, Long handleTime) {
+
+        mpRevRequestMapper.update(id, status, adminRemark, reason, handleTime);
+    }
 }