From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图,添加口碑

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   17 +++++++++++++++--
 1 files changed, 15 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 37f2d4b..6c819a4 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
@@ -44,6 +44,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
 import com.yeshi.fanli.entity.common.ImageInfo;
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.taobao.SearchFilter;
@@ -1021,7 +1022,7 @@
 			tg.setTaoBaoQuanInfo(quanInfo);
 		}
 
-		BigDecimal proportion = taoBaoUtil.manageService.getFanLiRate();
+		BigDecimal proportion = taoBaoUtil.manageService.getFanLiRate(UserLevelEnum.daRen);
 		TaoBaoHongBaoInfo hongBaoInfo = new TaoBaoHongBaoInfo();
 		String tkMktStatus = tb.getTkMktStatus();
 		if ("1".equals(tkMktStatus)) {
@@ -1750,15 +1751,27 @@
 		TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
 		taoBaoGoods.setAuctionId(detail.getGoodsId());
 		taoBaoGoods.setBiz30day(detail.getMonthSales());
+		// 鍒哥浉鍏宠浆鎹�
 		taoBaoGoods.setCouponAmount(detail.getCouponPrice());
-		taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getCouponConditions(),
+		taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getOriginalPrice(),
 				MoneyBigDecimalUtil.getWithNoZera(detail.getCouponPrice())));
 		if (detail.getCouponTotalNum() != null && detail.getCouponReceiveNum() != null)
 			taoBaoGoods.setCouponLeftCount(detail.getCouponTotalNum() - detail.getCouponReceiveNum());
 		else
 			taoBaoGoods.setCouponLeftCount(0);
 		taoBaoGoods.setCouponStartFee(detail.getOriginalPrice());
+		try {
+			taoBaoGoods.setCouponStartFee(detail.getOriginalPrice());
+		} catch (Exception e) {
+		}
+
 		taoBaoGoods.setCouponTotalCount(detail.getCouponTotalNum());
+		taoBaoGoods.setCouponLink(detail.getCouponLink());
+		taoBaoGoods.setCouponEffectiveStartTime(TimeUtil.getGernalTime(
+				TimeUtil.convertToTimeTemp(detail.getCouponStartTime(), "yyyy-MM-dd HH:mm:ss"), "yyyy-MM-dd"));
+		taoBaoGoods.setCouponEffectiveEndTime(TimeUtil.getGernalTime(
+				TimeUtil.convertToTimeTemp(detail.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss"), "yyyy-MM-dd"));
+
 		taoBaoGoods.setPictUrl(detail.getMainPic());
 		taoBaoGoods.setPictUrlWhite(detail.getMainPic());
 		if (taoBaoGoods.getPictUrl() != null && !taoBaoGoods.getPictUrl().startsWith("http"))

--
Gitblit v1.8.0