From e57271b299b6568fd00e8046b79befbb1f224d2c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 14 五月 2019 15:06:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 02d719f..fc1e349 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
@@ -63,7 +63,6 @@
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;
@@ -761,14 +760,14 @@
tg.setTaoBaoHongBaoInfo(hongBaoInfo);
+ tg.setMoneyType(1);
+ tg.setSalesType(1);
// 娴嬭瘯浣跨敤
-// 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("鏍囩娴嬭瘯鍐呭", "#00FF00"));
-// tg.setLabels(labels);
+ // tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
+ // List<ClientTextStyleVO> labels = new ArrayList<>();
+ // labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#FF0000"));
+ // labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#00FF00"));
+ // tg.setLabels(labels);
return tg;
}
@@ -1013,14 +1012,16 @@
}
tg.setTaoBaoHongBaoInfo(hongBaoInfo);
+ tg.setMoneyType(1);
+ tg.setSalesType(1);
// 娴嬭瘯浣跨敤
-// 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("鏍囩娴嬭瘯鍐呭", "#00FF00"));
-// tg.setLabels(labels);
+ // 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("鏍囩娴嬭瘯鍐呭", "#00FF00"));
+ // tg.setLabels(labels);
return tg;
}
--
Gitblit v1.8.0