From 28a0efc6ec16f3f82eb8e16e87269300d6744fd4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 25 九月 2019 19:18:17 +0800
Subject: [PATCH] 金币版本拦截与频率拦截bug修改
---
fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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..d35ea6f 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");
@@ -809,8 +807,8 @@
try {
// 鐢荤涓�寮�
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) {
int topX = 50;
@@ -820,7 +818,7 @@
// 鐢诲ぇ鍥� 璧峰鐐瑰潗鏍囦负锛�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", ""));
BufferedImage picImage = ImageIO.read(goodsPicture);
picImage = ImageUtil.zoomInImage(picImage, widht, height);
g2d.drawImage(picImage, topX, topX, null);
@@ -909,7 +907,7 @@
// 鐢诲ぇ鍥�
InputStream goodsPicture = TaoBaoHttpUtil
- .getAsInputStream(goods.getPictUrl().replace("_.webp", ""));
+ .getAsInputStream(goods.getPicture().replace("_.webp", ""));
BufferedImage picImage = ImageIO.read(goodsPicture);
picImage = ImageUtil.zoomInImage(picImage, 315, 315);
g2d.drawImage(picImage, topX, topY, null);
--
Gitblit v1.8.0