From 8c04d27e5cebb7e654c208533e9567c4df2c8acc Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 12 十二月 2019 14:21:44 +0800
Subject: [PATCH] 券时间限制

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 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 0c73929..bfdd421 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
@@ -15,7 +15,6 @@
 
 import com.yeshi.fanli.dao.mybatis.share.SpreadUserImgMapper;
 import com.yeshi.fanli.dao.mybatis.user.SpreadImgMapper;
-import com.yeshi.fanli.dao.user.UserInfoDao;
 import com.yeshi.fanli.entity.bus.invite.SpreadImg;
 import com.yeshi.fanli.entity.bus.invite.SpreadUserImg;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -23,6 +22,7 @@
 import com.yeshi.fanli.service.inter.user.QrCodeService;
 import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 
@@ -39,7 +39,7 @@
 	private QrCodeService qrCodeService;
 
 	@Resource
-	private UserInfoDao userInfoDao;
+	private UserInfoService userInfoService;
 
 	@Resource
 	private UserInfoExtraService userInfoExtraService;
@@ -170,24 +170,21 @@
 
 		UserInfo user = null;
 		if (dlist != null && dlist.size() > 0)
-			user = userInfoDao.find(UserInfo.class, uid);
+			user = userInfoService.selectByPKey(uid);
 
-		String inviteCode = null;
-		UserInfoExtra extraInfo = userInfoExtraService.getUserInfoExtra(uid);
-		if (extraInfo != null) {
-			inviteCode = extraInfo.getInviteCode();
-		}
+		String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
 		// 娣诲姞鍘熸潵娌℃湁鐨�
 		for (String md5 : dlist) {
 			for (SpreadImg img : spreadImgList)
 				if (img.getMd5().equalsIgnoreCase(md5)) {
 					// 鐢诲浘
 					try {
-
-						String imgUrl = qrCodeService.drawInviteQrCode(img.getUrl(), uid,
-								StringUtil.isNullOrEmpty(user.getPortrait())
-										? Constant.systemCommonConfig.getDefaultPortrait() : user.getPortrait(),
-								inviteCode);
+						String portrait = user.getPortrait();
+						if (StringUtil.isNullOrEmpty(portrait)) {
+							portrait = Constant.systemCommonConfig.getDefaultPortrait();
+						}
+						
+						String imgUrl = qrCodeService.drawInviteQrCodeNew(img.getUrl(), uid, portrait, null, null, null, inviteCode);
 						if (!StringUtil.isNullOrEmpty(imgUrl)) {
 							if (imgUrl != null) {
 								addUserInviteImg(uid, imgUrl);
@@ -222,7 +219,7 @@
 		// }
 
 		// 鐢熸垚
-		UserInfo user = userInfoDao.find(UserInfo.class, uid);
+		UserInfo user = userInfoService.selectByPKey(uid);
 		try {
 			String imgUrl = qrCodeService.drawInviteQrCode(bgImg, uid, user.getPortrait(), null);
 			return imgUrl;
@@ -234,7 +231,7 @@
 
 	@Override
 	public String getUserSpreadImg(Long uid, String bgImg, int erCodePostionX, int erCodePostionY, int erCodeSize) {
-		UserInfo user = userInfoDao.find(UserInfo.class, uid);
+		UserInfo user = userInfoService.selectByPKey(uid);
 		try {
 			String imgUrl = qrCodeService.drawInviteQrCode(bgImg, uid, user.getPortrait(), erCodePostionX,
 					erCodePostionY, erCodeSize, null);
@@ -252,8 +249,8 @@
 
 	
 	@Override
-	public String drawInviteQrCodeNew(String bgImg, Long uid, String portrait, String inviteCode) throws Exception {
-		return qrCodeService.drawInviteQrCodeNew(bgImg, uid, portrait, inviteCode);
+	public String drawInviteQrCodeNew(String bgImg, Long uid, String portrait, Integer pX, Integer pY, Integer size, String inviteCode) throws Exception {
+		return qrCodeService.drawInviteQrCodeNew(bgImg, uid, portrait, pX, pY, size, inviteCode);
 	}
 	
 	

--
Gitblit v1.8.0