From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 11 七月 2019 16:34:13 +0800 Subject: [PATCH] 订单bug,分享爆款自购修改 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 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 43796dc..6fcb512 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 @@ -19,8 +19,10 @@ 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; @@ -38,6 +40,9 @@ @Resource private UserInfoDao userInfoDao; + + @Resource + private UserInfoExtraService userInfoExtraService; @Override public void addUserInviteImg(Long uid, String imgUrl) { @@ -166,15 +171,24 @@ 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()); + 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); @@ -211,7 +225,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(); @@ -224,7 +238,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(); @@ -234,8 +248,18 @@ @Override public int countUserSpreadImg(Long uid) { - return (int) (spreadUserImgMapper.imgUrlCount(uid)); } + + @Override + 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); + } + + + @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