From b63c28a0c24782753eae26892171dd1a0c8d1fe7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期日, 05 五月 2019 12:19:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 4d40521..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();
}
@@ -1806,19 +1806,19 @@
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;
+ 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