From faabdba4cdfc442d3dc5f06bd9ae9cc90d8161c3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 五月 2019 09:32:34 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 8d09ae6..9c3dcde 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
@@ -706,7 +706,7 @@
tg.setState(tb.getState()); // 鐘舵�侊細2018-12-03
if (tb.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
- tg.setCoupon(true);// 鏈夊埜
+ tg.setCoupon(true);// 鏈夊埜
TaoBaoQuanInfo quanInfo = new TaoBaoQuanInfo();
quanInfo.setCouponAmount(tb.getCouponAmount());
@@ -761,15 +761,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("鏍囩鍐呭", "#F14242"));
+ 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("鏍囩鍐呭", "#F14242"));
+ labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#000000"));
+ tg.setLabels(labels);
return tg;
}
--
Gitblit v1.8.0