From 020d940ae4e16f55f69cef3dd4c8dc0b9764af07 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 26 六月 2019 10:59:48 +0800
Subject: [PATCH] 邀请对应奖励红包加入版本区分
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 53156cd..3880340 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
@@ -65,6 +65,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;
@@ -766,10 +767,13 @@
tg.setSalesType(1);
// 娴嬭瘯浣跨敤
// 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);
+// if(Constant.IS_TEST)
+// {
+// List<ClientTextStyleVO> labels = new ArrayList<>();
+// labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
+// labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
+// tg.setLabels(labels);
+// }
return tg;
}
@@ -1709,10 +1713,16 @@
taoBaoGoods.setCouponLeftCount(detail.getCouponTotalNum() - detail.getCouponReceiveNum());
else
taoBaoGoods.setCouponLeftCount(0);
- taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getCouponConditions()));
+ taoBaoGoods.setCouponStartFee(detail.getOriginalPrice());
taoBaoGoods.setCouponTotalCount(detail.getCouponTotalNum());
taoBaoGoods.setPictUrl(detail.getMainPic());
taoBaoGoods.setPictUrlWhite(detail.getMainPic());
+ if (taoBaoGoods.getPictUrl() != null && !taoBaoGoods.getPictUrl().startsWith("http"))
+ taoBaoGoods.setPictUrl("https:" + taoBaoGoods.getPictUrl());
+
+ if (taoBaoGoods.getPictUrlWhite() != null && !taoBaoGoods.getPictUrlWhite().startsWith("http"))
+ taoBaoGoods.setPictUrlWhite("https:" + taoBaoGoods.getPictUrlWhite());
+
taoBaoGoods.setSellerId(detail.getSellerId());
taoBaoGoods.setShopTitle(detail.getShopName());
taoBaoGoods.setTitle(detail.getDtitle());
--
Gitblit v1.8.0