From 5396bf8f7e14a559f825e275579e0091a9d29e73 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 十一月 2019 16:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 d35ea6f..64d5dff 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
@@ -805,12 +805,13 @@
try {
+ boolean index = true;
// 鐢荤涓�寮�
for (int i = 0; i < goodsList.size(); i++) {
CommonGoods goods = goodsList.get(i);
BigDecimal couplePrice = CommonGoodsUtil.getAfterUseCouplePrice(goods);
// 绗竴寮犲浘闇�瑕佹湁浠锋牸淇℃伅
- if (i == 0) {
+ if (i == 0 || index) {
int topX = 50;
int topY = 50;
@@ -819,6 +820,9 @@
int widht = 650;
int height = 650;
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);
@@ -885,6 +889,8 @@
g2d.drawString("楼 " + withNoZera + "", quanBGWidht + 70, quanBGHeight + 48);
}
+ index = false;
+
} else {
// 璁＄畻宸︿笂瑙掑潗鏍�
int topX = 0;
@@ -906,8 +912,10 @@
topY = 50 + (315 + 20) * 2;
// 鐢诲ぇ鍥�
- InputStream goodsPicture = TaoBaoHttpUtil
- .getAsInputStream(goods.getPicture().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