From eda623f37c3260f4b4657e34a8a39798c72432b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 28 六月 2020 15:49:14 +0800
Subject: [PATCH] 搜索接口增加小黄条返回

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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 678651e..eb35645 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
@@ -1785,6 +1785,20 @@
 		if (taoBaoGoods.getPictUrlWhite() != null && !taoBaoGoods.getPictUrlWhite().startsWith("http"))
 			taoBaoGoods.setPictUrlWhite("https:" + taoBaoGoods.getPictUrlWhite());
 
+		
+		String imgs = detail.getImgs();
+		if (!StringUtil.isNullOrEmpty(imgs)) {
+			String[] array = imgs.split(",");
+			if (array != null && array.length > 0) {
+				List<String> imgList = new ArrayList<>();
+				for (int i = 0 ; i < array.length; i++) {
+					imgList.add(array[i]);
+				}
+				taoBaoGoods.setImgList(imgList);
+			}
+		}
+		
+		
 		taoBaoGoods.setSellerId(detail.getSellerId());
 		taoBaoGoods.setShopTitle(detail.getShopName());
 		taoBaoGoods.setTitle(detail.getDtitle());
@@ -2195,10 +2209,10 @@
 	public static BigDecimal getCanShareMoney(Date createTime, BigDecimal estimate) {
 		if (estimate == null)
 			return null;
-		if (createTime.getTime() < TimeUtil.convertToTimeTemp("2020-05-01", "yyyy-MM-dd")) {
+		if (createTime.getTime() < TimeUtil.convertToTimeTemp("2020-06-01 12:30:00", "yyyy-MM-dd HH:mm:ss")) {
 			return estimate;
 		}
-		BigDecimal rate = new BigDecimal("0.8876");
+		BigDecimal rate = new BigDecimal("0.9101");
 		return MoneyBigDecimalUtil.mul(estimate, rate);
 	}
 

--
Gitblit v1.8.0