From d36a73eb2aaf9383d0cc1f40c65b21138c75c741 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 08 五月 2019 16:13:14 +0800
Subject: [PATCH] redis

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   26 +++++++++++++++++++-------
 1 files changed, 19 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 5a753ca..c17ca9f 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
@@ -762,8 +762,8 @@
 		tg.setSalesType(Math.random() > 0.5 ? 1 : 2);
 		tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
 		List<ClientTextStyleVO> labels = new ArrayList<>();
-		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
-		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
+		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#FF0000"));
+		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#00FF00"));
 		tg.setLabels(labels);
 
 		return tg;
@@ -1014,8 +1014,8 @@
 		tg.setSalesType(Math.random() > 0.5 ? 1 : 2);
 		tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
 		List<ClientTextStyleVO> labels = new ArrayList<>();
-		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
-		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
+		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#FF0000"));
+		labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#00FF00"));
 		tg.setLabels(labels);
 
 		return tg;
@@ -1329,9 +1329,9 @@
 	 * @return
 	 */
 	public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
-		if (goodsBrief != null && goodsBrief.getMaterialLibType() != null && goodsBrief.getMaterialLibType() == 0)
-			return "楼0.00";
-		else
+//		if (goodsBrief != null && goodsBrief.getMaterialLibType() != null && goodsBrief.getMaterialLibType() == 0)
+//			return "楼0.00";
+//		else
 			return "楼" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
 	}
 
@@ -1805,9 +1805,21 @@
 		else
 			shop.setUserType(0);
 
+		shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));
+
 		return shop;
 	}
 
+	/**
+	 * 鏍规嵁鍗栧id鑾峰彇搴楅摵閾炬帴
+	 * 
+	 * @param sellerId
+	 * @return
+	 */
+	public static String getShopLink(Long sellerId) {
+		return "http://store.taobao.com/shop/view_shop.htm?user_number_id=" + sellerId;
+	}
+
 	public static void main(String[] args) {
 		String s = channelMap.get("3");
 		System.out.println(s);

--
Gitblit v1.8.0