Merge branch 'gift_card_func' into pre

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -528,7 +528,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 			throw BusinessRuntimeException.getInstance("无效礼品卡,好友未购买");
 		}
 		List<Long> relationUserIdList = userBindRelationService.getRelationUserIdList(userId, null);
-		if (relationUserIdList.contains(userId)) {
+		if (relationUserIdList.contains(giftCardUserRecord.getUserId())) {
 			throw BusinessRuntimeException.getInstance("无法领取自己购买的礼品卡");
 		}
 		if (giftCardUserRecord.getToUserId() != 0 && !giftCardUserRecord.getToUserId().equals(userId)) {