。

src/main/java/com/izouma/nineth/repo/MetaUserFriendApplyRecordRepo.java

@@ -16,4 +16,5 @@ public interface MetaUserFriendApplyRecordRepo extends JpaRepository<MetaUserFri
 
     MetaUserFriendApplyRecord findByUserIdAndFriendIdAndOperateTypeAndDel(Long userId, Long friendId, MetaUserFriendOperateType operateType, boolean del);
 
+    MetaUserFriendApplyRecord findByUserIdAndFriendIdAndDel(Long userId, Long friendId, boolean del);
 }

src/main/java/com/izouma/nineth/service/MetaUserFriendService.java

@@ -99,8 +99,10 @@ public class MetaUserFriendService {
         return metaUserFriendApplyRecordService.apply(metaUserFriendApplyRecord);
     }
 
-    public MetaRestResult<Void> delApply(Long applyRecordId) {
-        MetaUserFriendApplyRecord metaUserFriendApplyRecord = metaUserFriendApplyRecordRepo.findById(applyRecordId).orElse(null);
+    public MetaRestResult<Void> delApply(Long userId) {
+        Long friendId = SecurityUtils.getAuthenticatedUser().getId();
+        // 判断申请记录
+        MetaUserFriendApplyRecord metaUserFriendApplyRecord = metaUserFriendApplyRecordRepo.findByUserIdAndFriendIdAndDel(userId, friendId, false);
         if (Objects.isNull(metaUserFriendApplyRecord)) {
             return MetaRestResult.returnError("申请单不存在");
         }
@@ -114,12 +116,13 @@ public class MetaUserFriendService {
     }
 
     @Transactional
-    public MetaRestResult<Void> operatingApply(Long applyRecordId, MetaUserFriendOperateType operateType) {
-        if (Objects.isNull(applyRecordId)) {
-            return MetaRestResult.returnError("Illegal parameter : applyRecordId can not be null");
+    public MetaRestResult<Void> operatingApply(Long userId, MetaUserFriendOperateType operateType) {
+        if (Objects.isNull(userId)) {
+            return MetaRestResult.returnError("Illegal parameter : userId can not be null");
         }
+        Long friendId = SecurityUtils.getAuthenticatedUser().getId();
         // 判断申请记录
-        MetaUserFriendApplyRecord metaUserFriendApplyRecord = metaUserFriendApplyRecordRepo.findById(applyRecordId).orElse(null);
+        MetaUserFriendApplyRecord metaUserFriendApplyRecord = metaUserFriendApplyRecordRepo.findByUserIdAndFriendIdAndDel(userId, friendId, false);
         if (Objects.isNull(metaUserFriendApplyRecord)) {
             return MetaRestResult.returnError("暂无申请信息");
         }

src/main/java/com/izouma/nineth/web/MetaUserFriendController.java

@@ -38,19 +38,19 @@ public class MetaUserFriendController extends BaseController {
         return metaUserFriendService.apply(metaUserFriendApplyRecord);
     }
 
-    @PostMapping("{applyRecordId}/delApply")
-    public MetaRestResult<Void> delApply(@PathVariable Long applyRecordId) {
-        return metaUserFriendService.delApply(applyRecordId);
+    @PostMapping("{userId}/delApply")
+    public MetaRestResult<Void> delApply(@PathVariable Long userId) {
+        return metaUserFriendService.delApply(userId);
     }
 
-    @PostMapping("/{applyRecordId}/pass")
-    public MetaRestResult<Void> pass(@PathVariable Long applyRecordId) {
-        return metaUserFriendService.operatingApply(applyRecordId, MetaUserFriendOperateType.PASS);
+    @PostMapping("/{userId}/pass")
+    public MetaRestResult<Void> pass(@PathVariable Long userId) {
+        return metaUserFriendService.operatingApply(userId, MetaUserFriendOperateType.PASS);
     }
 
-    @PostMapping("/{applyRecordId}/refuse")
-    public MetaRestResult<Void> refuse(@PathVariable Long applyRecordId) {
-        return metaUserFriendService.operatingApply(applyRecordId, MetaUserFriendOperateType.REFUSE);
+    @PostMapping("/{userId}/refuse")
+    public MetaRestResult<Void> refuse(@PathVariable Long userId) {
+        return metaUserFriendService.operatingApply(userId, MetaUserFriendOperateType.REFUSE);
     }
 
     @PostMapping("/{friendId}/del")