From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
index 1da367d..8f5f1b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
@@ -248,7 +248,8 @@
* @param goods
* @return
*/
- public static InputStream drawGoodsPoster(InputStream qrcode, InputStream portraitStream, String inviteCode, GoodsDetailVO goods) {
+ public static InputStream drawGoodsPoster(InputStream qrcode, InputStream portraitStream, String inviteCode,
+ String mainPic, GoodsDetailVO goods) {
try {
String fontPath = "/usr/share/fonts/PingFang_Medium.ttf";
String os = System.getProperty("os.name");
@@ -282,7 +283,7 @@
int spacing = 20; // 鍙宠竟璺�
// 1銆佺敾鍟嗗搧涓诲浘
- InputStream picStream = HttpUtil.getAsInputStream(goods.getPicUrl().replace("https://", "http://"));
+ InputStream picStream = HttpUtil.getAsInputStream(mainPic);
// InputStream picStream = ImageUtil.class.getClassLoader().getResourceAsStream("image/share/test_pic1.jpg");
g2d.drawImage(ImageIO.read(picStream), 0, 0, x, y, null);
@@ -379,10 +380,12 @@
InputStream ziying = null;
if (goods.getShopType() == 21) {
ziying = ImageUtil.class.getClassLoader().getResourceAsStream("image/icon_ziying.png");
+ g2d.drawImage(ImageIO.read(ziying), baoYouLength, y + 150, 60, 30, null);
} else if (goods.isBaoyou()) {
ziying = ImageUtil.class.getClassLoader().getResourceAsStream("image/icon_baoyou.png");
+ g2d.drawImage(ImageIO.read(ziying), baoYouLength, y + 150, 60, 30, null);
}
- g2d.drawImage(ImageIO.read(ziying), baoYouLength, y + 150, 60, 30, null);
+
// 閿�閲�
String sale = null;
@@ -421,9 +424,9 @@
g2d.drawImage(ImageIO.read(codeFrame), spacing + 405, y + 200, 200, 203, null);
// 鐢讳簩缁寸爜
- int codeSize = 190;
- int pX = spacing + 411;
- int pY = y + 207;
+ int codeSize = 170;
+ int pX = spacing + 422;
+ int pY = y + 217;
g2d.drawImage(ImageIO.read(qrcode), pX, pY, codeSize, codeSize, null);
int portraitSize = 200 * 5 / 23;
--
Gitblit v1.8.0