From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java
index 98f6a4d..6bda83f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java
@@ -35,7 +35,7 @@
}
@Override
- public String drawInviteQrCode(String url, Long uid, String portrait) throws IOException {
+ public String drawInviteQrCode(String url, Long uid, String portrait, String inviteCode) throws IOException {
if (url != null && !url.equals("")) {
String targetPath = FileUtil.getCacheDir() + "/share_" + uid + "_" + System.currentTimeMillis() + ".jpg";
String erCodeTempPath = FileUtil.getCacheDir() + "/" + uid + "_" + System.currentTimeMillis() + ".jpg";
@@ -54,7 +54,7 @@
InputStream erCodeInputStream = new FileInputStream(new File(erCodeTempPath)); // 浜岀淮鐮�
// 寮�濮嬫牴鎹� url(鑳屾櫙鍥�), qrCode(浜岀淮鐮�), portrait(澶村儚) 鐢熸垚鍥剧墖
- ImageUtil.inviteFriendImg(urlInputStream, portraitInputStream, erCodeInputStream, targetPath);
+ ImageUtil.inviteFriendImg(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, inviteCode);
if (new File(targetPath).exists() && new File(targetPath).length() > 0) {
// 涓婁紶鏂囦欢
@@ -84,7 +84,7 @@
@Override
public String drawInviteQrCode(String url, Long uid, String portrait, int erCodePostionX, int erCodePostionY,
- int erCodeSize) throws IOException {
+ int erCodeSize, String inviteCode) throws IOException {
if (!StringUtil.isNullOrEmpty(url)) {
String targetPath = FileUtil.getCacheDir() + "/share_" + uid + "_" + System.currentTimeMillis() + ".jpg";
String erCodeTempPath = FileUtil.getCacheDir() + "/" + uid + "_" + System.currentTimeMillis() + ".jpg";
@@ -104,7 +104,7 @@
// 寮�濮嬫牴鎹� url(鑳屾櫙鍥�), qrCode(浜岀淮鐮�), portrait(澶村儚) 鐢熸垚鍥剧墖
ImageUtil.inviteFriendImg(urlInputStream, portraitInputStream, erCodeInputStream, targetPath,
- erCodePostionX, erCodePostionY, erCodeSize);
+ erCodePostionX, erCodePostionY, erCodeSize, inviteCode);
if (new File(targetPath).exists() && new File(targetPath).length() > 0) {
// 涓婁紶鏂囦欢
--
Gitblit v1.8.0