From 2f2860b50f24e5e3598d223db03d43df61d95c97 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 13 三月 2020 16:31:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 9de45c7..ba8b192 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
@@ -286,11 +286,12 @@
@Override
- public FileUploadResult drawDynamicGoodsPoster(String erCodeUrl, String portrait, String inviteCode, GoodsDetailVO goods) {
+ public FileUploadResult drawDynamicGoodsPoster(String erCodeUrl, String portrait, String inviteCode,
+ String mainPic, GoodsDetailVO goods) {
// 浜岀淮鐮佹祦
InputStream erCodeStream = null;
try {
- erCodeStream = QRCodeUtil.getInstance(250).encode(erCodeUrl);
+ erCodeStream = QRCodeUtil.getInstance(250).encodeDeleteWhite(erCodeUrl);
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -309,7 +310,7 @@
}
// 鐢诲浘
- InputStream drawStream = ImageUtil.drawGoodsPoster(erCodeStream, portraitStream,inviteCode, goods);
+ InputStream drawStream = ImageUtil.drawGoodsPoster(erCodeStream, portraitStream,inviteCode,mainPic, goods);
// 涓婁紶浣嶇疆
String uuid = UUID.randomUUID().toString().replace("-", "");
String upPath = FilePathEnum.shareGoods.getPath() + uuid + "_" + goods.getGoodsId() + "_" + System.currentTimeMillis() + ".png";
--
Gitblit v1.8.0