From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 9cca066..28b7f6d 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,21 +15,19 @@
import com.yeshi.fanli.dao.mybatis.share.SpreadUserImgMapper;
import com.yeshi.fanli.dao.mybatis.user.SpreadImgMapper;
-import com.yeshi.fanli.dao.user.SpreadUserImgDao;
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;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
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.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@Service
public class SpreadUserImgServiceImpl implements SpreadUserImgService {
-
- @Resource
- private SpreadUserImgDao spreadUserImgDao;
@Resource
private SpreadUserImgMapper spreadUserImgMapper;
@@ -43,6 +41,9 @@
@Resource
private UserInfoDao userInfoDao;
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
@Override
public void addUserInviteImg(Long uid, String imgUrl) {
SpreadUserImg spreadUserImg = new SpreadUserImg();
@@ -50,7 +51,7 @@
spreadUserImg.setUrl(imgUrl); // 鏈嶅姟鍣ㄤ笂鐨剈rl鍦板潃
spreadUserImg.setType(0);
spreadUserImg.setCreatetime(new Date());
- spreadUserImgDao.save(spreadUserImg);
+ spreadUserImgMapper.insertSelective(spreadUserImg);
}
@Override
@@ -93,7 +94,7 @@
List<String> imgList = new ArrayList<>();
// 鏌ヨ褰撳墠鐢ㄦ埛鐨勬帹骞垮浘
- List<SpreadUserImg> spreadUserImgList = spreadUserImgDao.list("from SpreadUserImg su where su.uid=" + uid);
+ List<SpreadUserImg> spreadUserImgList = spreadUserImgMapper.listByUid(uid);
// 鏌ヨ绯荤粺鐨勬帹骞垮浘
List<SpreadImg> spreadImgList = spreadImgMapper.listAll();
@@ -160,7 +161,7 @@
for (String md5 : extraList) {
for (SpreadUserImg img : spreadUserImgList)
if (img.getMd5().equalsIgnoreCase(md5)) {
- spreadUserImgDao.delete(img);
+ spreadUserImgMapper.deleteByPrimaryKey(img.getId());
break;
}
}
@@ -170,15 +171,23 @@
UserInfo user = null;
if (dlist != null && dlist.size() > 0)
user = userInfoDao.find(UserInfo.class, uid);
+
+ String inviteCode = null;
+ UserInfoExtra extraInfo = userInfoExtraService.getUserInfoExtra(uid);
+ if (extraInfo != null) {
+ inviteCode = extraInfo.getInviteCode();
+ }
// 娣诲姞鍘熸潵娌℃湁鐨�
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());
+ ? Constant.systemCommonConfig.getDefaultPortrait() : user.getPortrait(),
+ inviteCode);
if (!StringUtil.isNullOrEmpty(imgUrl)) {
if (imgUrl != null) {
addUserInviteImg(uid, imgUrl);
@@ -192,7 +201,7 @@
}
// 閲嶆柊鏌ヨ
- spreadUserImgList = spreadUserImgDao.list("from SpreadUserImg su where su.uid=" + uid);
+ spreadUserImgList = spreadUserImgMapper.listByUid(uid);
imgList.clear();
if (spreadUserImgList != null)
for (SpreadUserImg img : spreadUserImgList)
@@ -215,7 +224,7 @@
// 鐢熸垚
UserInfo user = userInfoDao.find(UserInfo.class, uid);
try {
- String imgUrl = qrCodeService.drawInviteQrCode(bgImg, uid, user.getPortrait());
+ String imgUrl = qrCodeService.drawInviteQrCode(bgImg, uid, user.getPortrait(), null);
return imgUrl;
} catch (IOException e) {
e.printStackTrace();
@@ -228,7 +237,7 @@
UserInfo user = userInfoDao.find(UserInfo.class, uid);
try {
String imgUrl = qrCodeService.drawInviteQrCode(bgImg, uid, user.getPortrait(), erCodePostionX,
- erCodePostionY, erCodeSize);
+ erCodePostionY, erCodeSize, null);
return imgUrl;
} catch (IOException e) {
e.printStackTrace();
@@ -239,7 +248,7 @@
@Override
public int countUserSpreadImg(Long uid) {
- return (int) (spreadUserImgDao.getCount("select count(*) from SpreadUserImg u where u.uid=" + uid));
+ return (int) (spreadUserImgMapper.imgUrlCount(uid));
}
}
--
Gitblit v1.8.0