From 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 五月 2019 10:28:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java
index 9db9eae..0c73929 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java
@@ -252,8 +252,13 @@
 
 	
 	@Override
-	public String getInviteImg(Long uid, String bgImg, String inviteCode) throws Exception {
-		UserInfo user = userInfoDao.find(UserInfo.class, uid);
-		return qrCodeService.drawInviteQrCode(bgImg, uid, user.getPortrait(), inviteCode);
+	public String drawInviteQrCodeNew(String bgImg, Long uid, String portrait, String inviteCode) throws Exception {
+		return qrCodeService.drawInviteQrCodeNew(bgImg, uid, portrait, inviteCode);
+	}
+	
+	
+	@Override
+	public String getInviteImgToGreet(String bgImg, Long uid,  String portrait, String inviteCode, String content, Date date) throws Exception {
+		return qrCodeService.drawInviteToGreet(bgImg, uid,portrait, inviteCode, content, date);
 	}
 }

--
Gitblit v1.8.0