From aa552facf6d833acab0d3e3e29bda2a0fb826ffe Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 16:14:13 +0800
Subject: [PATCH] 品牌缓存生效
---
fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 18f7349..64d5dff 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
@@ -33,6 +33,7 @@
import org.yeshi.utils.entity.DateInfo;
import com.yeshi.fanli.entity.bus.activity.RecommendActivityTaoBaoGoods;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -199,7 +200,6 @@
font = font.deriveFont(30.0f);
g2d.setFont(font);
g2d.setColor(new Color(229, 0, 93));
- // g2d.drawString("杩斿埄鍒告彁閱掓偍", 250 + 17, 1080 + 17);
g2d.setColor(new Color(102, 102, 102));
g2d.drawString("闀挎寜璇嗗埆浜岀淮鐮侀鍙栦紭鎯犲埜", 250 + 17, 1130 + 17);
@@ -449,7 +449,6 @@
font = font.deriveFont(50.0f);
g2d.setFont(font);
g2d.setColor(new Color(229, 0, 93));
- // g2d.drawString("杩斿埄鍒告彁閱掓偍", 312, 1118 + 40);
g2d.setColor(new Color(102, 102, 102));
g2d.drawString("闀挎寜璇嗗埆浜岀淮鐮侀鍙栦紭鎯犲埜", 312, 1118 + 77);
@@ -716,7 +715,6 @@
font = font.deriveFont(50.0f);
g2d.setFont(font);
g2d.setColor(new Color(229, 0, 93));
- // g2d.drawString("杩斿埄鍒告彁閱掓偍", 312, 1118 + 40);
g2d.setColor(new Color(102, 102, 102));
g2d.drawString("闀挎寜璇嗗埆浜岀淮鐮佸厤璐归鍒�", 312, 1150);
@@ -763,7 +761,7 @@
* @return
*/
public static InputStream drawGoodsSharePicture(InputStream qrcodeStream, InputStream portrait,
- List<TaoBaoGoodsBrief> goodsList) {
+ List<CommonGoods> goodsList) {
String fontPath = "/usr/share/fonts/PingFang_Medium.ttf";
String os = System.getProperty("os.name");
@@ -807,12 +805,13 @@
try {
+ boolean index = true;
// 鐢荤涓�寮�
for (int i = 0; i < goodsList.size(); i++) {
- TaoBaoGoodsBrief goods = goodsList.get(i);
- BigDecimal couplePrice = TaoBaoUtil.getAfterUseCouplePrice(goods);
+ CommonGoods goods = goodsList.get(i);
+ BigDecimal couplePrice = CommonGoodsUtil.getAfterUseCouplePrice(goods);
// 绗竴寮犲浘闇�瑕佹湁浠锋牸淇℃伅
- if (i == 0) {
+ if (i == 0 || index) {
int topX = 50;
int topY = 50;
@@ -820,7 +819,10 @@
// 鐢诲ぇ鍥� 璧峰鐐瑰潗鏍囦负锛�50,50锛�
int widht = 650;
int height = 650;
- InputStream goodsPicture = TaoBaoHttpUtil.getAsInputStream(goods.getPictUrl().replace("_.webp", "").replace("_220x220", ""));
+ InputStream goodsPicture = TaoBaoHttpUtil.getAsInputStream(goods.getPicture().replace("_.webp", "").replace("_220x220", ""));
+ if (goodsPicture == null)
+ continue;
+
BufferedImage picImage = ImageIO.read(goodsPicture);
picImage = ImageUtil.zoomInImage(picImage, widht, height);
g2d.drawImage(picImage, topX, topX, null);
@@ -887,6 +889,8 @@
g2d.drawString("楼 " + withNoZera + "", quanBGWidht + 70, quanBGHeight + 48);
}
+ index = false;
+
} else {
// 璁＄畻宸︿笂瑙掑潗鏍�
int topX = 0;
@@ -908,8 +912,10 @@
topY = 50 + (315 + 20) * 2;
// 鐢诲ぇ鍥�
- InputStream goodsPicture = TaoBaoHttpUtil
- .getAsInputStream(goods.getPictUrl().replace("_.webp", ""));
+ InputStream goodsPicture = TaoBaoHttpUtil.getAsInputStream(goods.getPicture().replace("_.webp", ""));
+ if (goodsPicture == null)
+ continue;
+
BufferedImage picImage = ImageIO.read(goodsPicture);
picImage = ImageUtil.zoomInImage(picImage, 315, 315);
g2d.drawImage(picImage, topX, topY, null);
--
Gitblit v1.8.0