From cebb70396a159270ce84cb44caeafa82faa439a4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 18:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 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 28b7f6d..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
@@ -183,11 +183,12 @@
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);
@@ -247,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