From 5e7b0ed4a154ad067cbcf4aa1a1c7cce32f9864c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2024 18:02:17 +0800
Subject: [PATCH] 唯品会链接解析升级
---
fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 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 7b42df6..46b6546 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
@@ -31,12 +31,14 @@
import org.yeshi.utils.DateLunarUtil;
import org.yeshi.utils.HttpUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
+import org.yeshi.utils.TimeUtil;
import org.yeshi.utils.entity.DateInfo;
import com.yeshi.fanli.entity.bus.activity.RecommendActivityTaoBaoGoods;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.goods.CommonGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -1418,7 +1420,7 @@
// 鐢荤涓�寮�
for (int i = 0; i < goodsList.size(); i++) {
TaoBaoGoodsBrief goods = goodsList.get(i);
- BigDecimal couplePrice = TaoBaoUtil.getAfterUseCouplePrice(goods);
+ BigDecimal couplePrice = TaoBaoUtil.getCouponPrice(goods);
// 绗竴寮犲浘闇�瑕佹湁浠锋牸淇℃伅
if (i == 0) {
int topX = 50;
@@ -1956,7 +1958,7 @@
g2d.drawImage(picImage, 50, 207, null);
// 鐢讳环鏍�
- BigDecimal money = TaoBaoUtil.getAfterUseCouplePrice(goods);
+ BigDecimal money = TaoBaoUtil.getCouponPrice(goods);
money = MoneyBigDecimalUtil.getWithNoZera(money);
g2d.setColor(new Color(240, 66, 66));
@@ -3076,27 +3078,29 @@
// 鏂囧瓧闂磋窛
int fontH = 24;
int spacingH = 14;
- // 鏂颁汉濂栧姳绾㈣壊鏂囧瓧
int y_temp = topPicH + 110 + fontH;
-
- g2d.setFont(boldFont24);
- g2d.setColor(new Color(229, 0, 92));
- g2d.drawString(rule.getNewRule(), spacing, y_temp);
-
- // 鏂颁汉濂栧姳瑙勫垯
- g2d.setFont(font24);
- g2d.setColor(new Color(51, 51, 51));
int fontNum = 10;
int maxWidth = 590;
+
+ // 鏂颁汉濂栧姳绾㈣壊鏂囧瓧
String newTitle = rule.getNewTitle();
- while (newTitle.length() > 0) {
- y_temp += spacingH + fontH;
- int lengthNew = ImageUtil.getTextLengthByWidth(g2d, font24, newTitle, maxWidth, fontNum);
- g2d.drawString(newTitle.substring(0, lengthNew), spacing, y_temp);
- newTitle = newTitle.substring(lengthNew);
- }
+ if (!StringUtil.isNullOrEmpty(newTitle)) {
+ g2d.setFont(boldFont24);
+ g2d.setColor(new Color(229, 0, 92));
+ g2d.drawString(rule.getNewRule(), spacing, y_temp);
- y_temp = y_temp + fontH + 50;
+ g2d.setFont(font24);
+ g2d.setColor(new Color(51, 51, 51));
+ while (newTitle.length() > 0) {
+ y_temp += spacingH + fontH;
+ int lengthNew = ImageUtil.getTextLengthByWidth(g2d, font24, newTitle, maxWidth, fontNum);
+ g2d.drawString(newTitle.substring(0, lengthNew), spacing, y_temp);
+ newTitle = newTitle.substring(lengthNew);
+ }
+ y_temp = y_temp + fontH + 50;
+ }
+
+
g2d.setFont(boldFont24);
g2d.setColor(new Color(229, 0, 92));
g2d.drawString(rule.getInviterRule(), spacing, y_temp);
@@ -3191,21 +3195,21 @@
// 鏂囧瓧闂磋窛
int fontH = 24;
int spacingH = 14;
-
int height = 110 + fontH;
- // 鏂颁汉濂栧姳瑙勫垯
+
int fontNum = 10;
int maxWidth = 590;
+ // 鏂颁汉濂栧姳瑙勫垯
String newTitle = rule.getNewTitle();
- while (newTitle.length() > 0) {
- height += spacingH + fontH;
- int lengthNew = ImageUtil.getTextLengthByWidth(g2d, font24, newTitle, maxWidth, fontNum);
- newTitle = newTitle.substring(lengthNew);
- }
-
-
+ if (!StringUtil.isNullOrEmpty(newTitle)) {
+ while (newTitle.length() > 0) {
+ height += spacingH + fontH;
+ int lengthNew = ImageUtil.getTextLengthByWidth(g2d, font24, newTitle, maxWidth, fontNum);
+ newTitle = newTitle.substring(lengthNew);
+ }
+ height = height + fontH+ 50;
+ }
// 閭�璇蜂汉濂栧姳绾㈠瓧
- height = height + fontH+ 50;
String inviterTitle = rule.getInviterTitle();
while (inviterTitle.length() > 0) {
height += spacingH + fontH;
--
Gitblit v1.8.0