From beee6afac3f7d1b7fa30f768df91cd55e6c6d2db Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 24 六月 2019 11:28:18 +0800
Subject: [PATCH] 增加汽车户外,增加拼多多常量

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 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 4d1109d..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
@@ -53,6 +53,7 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoShop;
 import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
 import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;
@@ -766,10 +767,12 @@
 		tg.setSalesType(1);
 		// 娴嬭瘯浣跨敤
 		// tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
-		// 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;
 	}
 
@@ -1698,6 +1701,38 @@
 		return taoBaoGoods;
 	}
 
+	public static TaoBaoGoodsBrief convert(DaTaoKeDetailV2 detail) {
+		TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
+		taoBaoGoods.setAuctionId(detail.getGoodsId());
+		taoBaoGoods.setBiz30day(detail.getMonthSales());
+		taoBaoGoods.setCouponAmount(detail.getCouponPrice());
+		taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getCouponConditions(),
+				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());
+		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());
+		taoBaoGoods.setUserType(detail.getShopType());
+		taoBaoGoods.setZkPrice(detail.getOriginalPrice());
+		taoBaoGoods.setTkRate(detail.getCommissionRate());
+		taoBaoGoods.setTkCommFee(new BigDecimal("0"));
+		taoBaoGoods.setState(0);
+		return taoBaoGoods;
+	}
+
 	/**
 	 * 鑾峰彇娣樺疂鑱旂洘鐨勬巿鏉冮摼鎺�
 	 * 

--
Gitblit v1.8.0