From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 20 ++++++++++++++++++--
1 files changed, 18 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 acfba6b..4d40521 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
@@ -760,8 +760,10 @@
// 娴嬭瘯浣跨敤
tg.setMoneyType(Math.random() > 0.5 ? 1 : 2);
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("鏍囩娴嬭瘯鍐呭", "#FF0000"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
tg.setLabels(labels);
return tg;
@@ -1010,8 +1012,10 @@
// 娴嬭瘯浣跨敤
tg.setMoneyType(Math.random() > 0.5 ? 1 : 2);
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("鏍囩娴嬭瘯鍐呭", "#FF0000"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
tg.setLabels(labels);
return tg;
@@ -1801,8 +1805,20 @@
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");
--
Gitblit v1.8.0