From 480fa41fa7ee8b3b3a38f46f28c2b8403299b44d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 24 六月 2019 09:19:44 +0800
Subject: [PATCH] 分类商品列表的bug修改

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 7e01b1c..a84f664 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -767,12 +767,11 @@
 		tg.setSalesType(1);
 		// 娴嬭瘯浣跨敤
 		// tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
-		if(Constant.IS_TEST)
-		{
-		 List<ClientTextStyleVO> labels = new ArrayList<>();
-		 labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
-		 labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
-		 tg.setLabels(labels);
+		if (Constant.IS_TEST) {
+			List<ClientTextStyleVO> labels = new ArrayList<>();
+			labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
+			labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
+			tg.setLabels(labels);
 		}
 		return tg;
 	}
@@ -1713,10 +1712,16 @@
 			taoBaoGoods.setCouponLeftCount(detail.getCouponTotalNum() - detail.getCouponReceiveNum());
 		else
 			taoBaoGoods.setCouponLeftCount(0);
-		taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getCouponConditions()));
+		taoBaoGoods.setCouponStartFee(detail.getOriginalPrice());
 		taoBaoGoods.setCouponTotalCount(detail.getCouponTotalNum());
 		taoBaoGoods.setPictUrl(detail.getMainPic());
 		taoBaoGoods.setPictUrlWhite(detail.getMainPic());
+		if (taoBaoGoods.getPictUrl() != null && !taoBaoGoods.getPictUrl().startsWith("http"))
+			taoBaoGoods.setPictUrl("https:" + taoBaoGoods.getPictUrl());
+
+		if (taoBaoGoods.getPictUrlWhite() != null && !taoBaoGoods.getPictUrlWhite().startsWith("http"))
+			taoBaoGoods.setPictUrlWhite("https:" + taoBaoGoods.getPictUrlWhite());
+
 		taoBaoGoods.setSellerId(detail.getSellerId());
 		taoBaoGoods.setShopTitle(detail.getShopName());
 		taoBaoGoods.setTitle(detail.getDtitle());

--
Gitblit v1.8.0