From 8a1878856e4cdd735d03c1cb7cd1576ed5967d1c Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 09 三月 2020 17:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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..476c96d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
@@ -379,10 +379,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 +423,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