Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/enums/MetaUserFriendOperateType.java

@@ -9,7 +9,9 @@ public enum MetaUserFriendOperateType {
 
     REFUSE("拒绝"),
 
-    DEL("删除");
+    DEL("删除"),
+
+    CANCEL("取消");
 
     private final String description;
 

src/main/java/com/izouma/nineth/security/WebSecurityConfig.java

@@ -183,6 +183,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/news/newsInfo").permitAll()
                 .antMatchers("/metaResources/like/**").permitAll()
                 .antMatchers("/metaResources/getLikeNum/**").permitAll()
+                .antMatchers("/metaProblem/findAll").permitAll()
+                .antMatchers("/metaQuestion/queryByApplication/**").permitAll()
                 // all other requests need to be authenticated
                 .anyRequest().authenticated().and()
                 // make sure we use stateless session; session won't be used to

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

@@ -54,7 +54,7 @@ public class MetaUserFriendApplyRecordService {
         MetaUserFriend friendExist = metaUserFriendRepo.findByUserIdAndFriendIdAndDel(metaUserFriendApplyRecord.getFriendId(), metaUserFriendApplyRecord.getUserId(), false);
         // 如果双方互为好友 不可重复添加
         if (Objects.nonNull(myExist) && Objects.nonNull(friendExist)) {
-            return MetaRestResult.returnError("当前好友已经添加过，不可重复添加");
+            return MetaRestResult.returnError(String.format("用户[%S]已经是您好友", metaUserFriendApplyRecord.getFriendId()));
         }
         metaUserFriendApplyRecord.setApplyTime(LocalDateTime.now());
         metaUserFriendApplyRecord.setOperateType(MetaUserFriendOperateType.APPLY);
@@ -82,7 +82,7 @@ public class MetaUserFriendApplyRecordService {
         metaUserFriendOperateRecord.setOperateType(metaUserFriendApplyRecord.getOperateType());
         LocalDateTime now = LocalDateTime.now();
         metaUserFriendOperateRecord.setOperatingTime(now);
-        metaUserFriendOperateRecord.setRemark(String.format("玩家[%S]于[%S][%S][%S]的好友申请", metaUserFriendApplyRecord.getFriendId(), now, MetaUserFriendOperateType.PASS.equals(operateType) ? "通过" : "拒绝", metaUserFriendApplyRecord.getUserId()));
+        metaUserFriendOperateRecord.setRemark(String.format("玩家[%S]于[%S][%S][%S]的好友申请", metaUserFriendApplyRecord.getFriendId(), now, operateType.getDescription(), metaUserFriendApplyRecord.getUserId()));
         metaUserFriendOperateRecordRepo.save(metaUserFriendOperateRecord);
         return MetaServiceResult.returnSuccess();
     }

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

@@ -115,7 +115,6 @@ public class MetaUserFriendService {
         }
         metaUserFriendApplyRecord.setDel(true);
         metaUserFriendApplyRecordRepo.save(metaUserFriendApplyRecord);
-        // TODO 是否添加操作记录
         return MetaRestResult.returnSuccess("删除成功");
     }
 
@@ -129,6 +128,9 @@ public class MetaUserFriendService {
         if (Objects.isNull(metaUserFriendApplyRecord)) {
             return MetaRestResult.returnError("暂无申请信息");
         }
+        if (!metaUserFriendApplyRecord.getFriendId().equals(SecurityUtils.getAuthenticatedUser().getId())) {
+            return MetaRestResult.returnError("当前用户不可操作该申请单");
+        }
         if (!MetaUserFriendOperateType.APPLY.equals(metaUserFriendApplyRecord.getOperateType())) {
             return MetaRestResult.returnError("当前申请单已经处理过，不可重复处理");
         }
@@ -137,7 +139,11 @@ public class MetaUserFriendService {
             MetaUserFriend friendExist = metaUserFriendRepo.findByUserIdAndFriendIdAndDel(metaUserFriendApplyRecord.getFriendId(), metaUserFriendApplyRecord.getUserId(), false);
             // 双方互为好友关系，不可添加
             if (Objects.nonNull(myExist) && Objects.nonNull(friendExist)) {
-                return MetaRestResult.returnError("当前好友已经添加过，不可重复添加");
+                MetaServiceResult result = metaUserFriendApplyRecordService.operatingApply(metaUserFriendApplyRecord, MetaUserFriendOperateType.CANCEL);
+                if (!result.isSuccess()) {
+                    return MetaRestResult.returnError(result.getMessage());
+                }
+                return MetaRestResult.returnError(String.format("用户[%S]已经是您好友", metaUserFriendApplyRecord.getFriendId()));
             }
             // 己方关系为空，添加己方关系
             if (Objects.isNull(myExist)) {
@@ -156,9 +162,9 @@ public class MetaUserFriendService {
                 metaUserFriendRepo.save(friend);
             }
         }
-        MetaServiceResult pass = metaUserFriendApplyRecordService.operatingApply(metaUserFriendApplyRecord, operateType);
-        if (!pass.isSuccess()) {
-            return MetaRestResult.returnError(pass.getMessage());
+        MetaServiceResult result = metaUserFriendApplyRecordService.operatingApply(metaUserFriendApplyRecord, operateType);
+        if (!result.isSuccess()) {
+            return MetaRestResult.returnError(result.getMessage());
         }
         return MetaRestResult.returnSuccess("操作成功");
     }