One of my guy friend constantly flirts with me..

What should I do one of my guy friends is super nice and flirts with me we been friends for 5 years nothing more but recently he has been super flirty. He knows I have a boyfriend I've been dating for a little over 2 years I asked him why he was acting that way and he said he likes me and we should try to be a couple and my current bf doesn't treat me the way I should be treated which is completely  not true and now it's beyond akward! I hate that now I have to feel weird around him. He just shows up at me apartment to hang out? And my bf is there i havnt told me bf this yet because he has a bit of a temper and don't want him to beat my guy friend up. What do you think I should do?