From 1261c227e7ad47607ee651bbd017ea80eb6d044a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 14 十二月 2019 18:45:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index 15f87ec..d935a2d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.impl.dynamic;
 
+import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -18,6 +19,7 @@
 import org.springframework.stereotype.Service;
 import org.yeshi.utils.DateLunarUtil;
 import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.HttpUtil;
 import org.yeshi.utils.taobao.TbImgUtil;
 
 import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;
@@ -715,8 +717,14 @@
 				size = inviteInfo.getSize();
 			}
 
+			InputStream asInputStream = HttpUtil.getAsInputStream(picUrl);
+			
+			int index = picUrl.lastIndexOf("/");
+			String newUrl = picUrl.substring(index + 1);
+			String urlMd5 = newUrl.substring(0, newUrl.lastIndexOf("."));
+			
 			// 鍥剧墖
-			String imgLink = qrCodeService.drawInviteQrCodeNew(picUrl, null, null, pX, pY, size, null);
+			String imgLink = qrCodeService.drawInviteQrCodeNew(asInputStream, urlMd5, null, null, pX, pY, size, null);
 			GoodsPicture p2 = new GoodsPicture();
 			p2.setW(100);
 			p2.setH(100);

--
Gitblit v1.8.0