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 | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 3ac8bcb..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
@@ -62,6 +62,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoHttpUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -756,6 +757,15 @@
tg.setTaoBaoHongBaoInfo(hongBaoInfo);
+ // 娴嬭瘯浣跨敤
+ 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("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
+ tg.setLabels(labels);
+
return tg;
}
@@ -998,6 +1008,15 @@
}
}
tg.setTaoBaoHongBaoInfo(hongBaoInfo);
+
+ // 娴嬭瘯浣跨敤
+ 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("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
+ tg.setLabels(labels);
return tg;
}
@@ -1765,13 +1784,13 @@
JSONArray array = sellerJson.optJSONArray("evaluates");
for (int i = 0; i < array.size(); i++) {
JSONObject item = array.optJSONObject(i);
- if ("瀹濊礉鎻忚堪".equalsIgnoreCase(item.optString("title"))) {
+ if ("瀹濊礉鎻忚堪".equalsIgnoreCase(item.optString("title").trim())) {
shop.setScoreGoods(new BigDecimal(item.optString("score").trim()));
shop.setScoreGoodsD(new BigDecimal(item.optString("level").trim()));
- } else if ("鍗栧鏈嶅姟".equalsIgnoreCase(item.optString("title"))) {
+ } else if ("鍗栧鏈嶅姟".equalsIgnoreCase(item.optString("title").trim())) {
shop.setScoreSeller(new BigDecimal(item.optString("score").trim()));
shop.setScoreSellerD(new BigDecimal(item.optString("level").trim()));
- } else if ("鐗╂祦鏈嶅姟".equalsIgnoreCase(item.optString("title"))) {
+ } else if ("鐗╂祦鏈嶅姟".equalsIgnoreCase(item.optString("title").trim())) {
shop.setScoreLogistics(new BigDecimal(item.optString("score").trim()));
shop.setScoreLogisticsD(new BigDecimal(item.optString("level").trim()));
}
@@ -1786,6 +1805,8 @@
else
shop.setUserType(0);
+ shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));
+
return shop;
}
--
Gitblit v1.8.0