修复了好友系统拒绝好友之后再添加会提示已经成为好友的问题

friendSystem/models/friend.go

@@ -60,13 +60,38 @@ func (f *FriendRelationship) AddFriend(addType string) (result interface{}, err
 	}
 	}
 	friendrelationship := make([]FriendRelationship, 0)
 	friendrelationship := make([]FriendRelationship, 0)
 	sql := ` select relationship_value from ice_friend_relationship where  (friend_relationship_a_id=? and  friend_relationship_b_id=?) or (friend_relationship_b_id=? and friend_relationship_a_id =?) `
 	sql := ` select relationship_value from ice_friend_relationship where  (friend_relationship_a_id=? and  friend_relationship_b_id=?) or (friend_relationship_b_id=? and friend_relationship_a_id =?) `
-	err = db.Engine.Sql(sql, f.FriendRelationshipAId, f.FriendRelationshipBId, f.FriendRelationshipAId, f.FriendRelationshipBId).Find(&friendrelationship)
+	if err = db.Engine.Sql(sql, f.FriendRelationshipAId, f.FriendRelationshipBId, f.FriendRelationshipAId, f.FriendRelationshipBId).Find(&friendrelationship); err != nil {
+		return nil, err
+	}
+
 	if len(friendrelationship) != 0 {
 	if len(friendrelationship) != 0 {
-		if friendrelationship[0].RelationshipValue == 0 {
+		// if friendrelationship[0].RelationshipValue == 0 {
+		// 	err = errors.New("已向该玩家发送请求")
+		// } else if friendrelationship[0].RelationshipValue == 1 {
+		// 	err = errors.New("该玩家已经是你的好友")
+		// } else {
+
+		// }
+		// return nil, err
+		switch friendrelationship[0].RelationshipValue {
+		case 0:
 			err = errors.New("已向该玩家发送请求")
 			err = errors.New("已向该玩家发送请求")
-		} else {
+			break
+		case 1:
 			err = errors.New("该玩家已经是你的好友")
 			err = errors.New("该玩家已经是你的好友")
+			break
+		case 2:
+			log.Println("该玩家已经拒绝过你的请求")
+			break
+		case 3:
+			err = errors.New("该玩家已经拒绝过你的请求")
+			break
+		default:
+			err = errors.New("未知的好友关系类型")
+			break
 		}
 		}
+	}
+	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
 	var res string
 	var res string