From 3ce9e928e082ff8abf697dba560cbfbb412e89f8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 15:45:02 +0800
Subject: [PATCH] 商城后台编辑
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 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 cde7b97..2cdc138 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
@@ -72,6 +72,7 @@
import com.yeshi.fanli.util.TaoBaoConstant;
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;
@@ -782,7 +783,41 @@
// labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
// tg.setLabels(labels);
// }
- return tg;
+ return loadYuShouInfo(tg, tb);
+ }
+
+ private static TaoBaoGoodsBriefExtra loadYuShouInfo(TaoBaoGoodsBriefExtra extra, TaoBaoGoodsBrief goods) {
+ if (goods != null && extra != null) {
+ if (isYUShou(goods)) {// 棰勫敭鍟嗗搧
+// extra.setZkPrice(new BigDecimal(goods.getPresaleDeposit()));
+ // 棰勫敭
+ if (extra.getLabels() == null)
+ extra.setLabels(new ArrayList<>());
+ extra.getLabels().add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+ }
+ }
+ return extra;
+ }
+
+ /**
+ * 鏄惁涓洪鍞晢鍝�
+ *
+ * @param goods
+ * @return
+ */
+ public static boolean isYUShou(TaoBaoGoodsBrief goods) {
+ if (!StringUtil.isNullOrEmpty(goods.getPresaleDeposit())
+ && !StringUtil.isNullOrEmpty(goods.getPresaleStartTime())
+ && !StringUtil.isNullOrEmpty(goods.getPresaleEndTime())) {
+ long startTime = Long.parseLong(goods.getPresaleStartTime());
+ long endTime = Long.parseLong(goods.getPresaleEndTime());
+ long now = System.currentTimeMillis();
+ if (now >= startTime && now < endTime) {
+ return true;
+ }
+ }
+
+ return false;
}
/**
@@ -1398,7 +1433,6 @@
*/
public static BigDecimal getGoodsHongBaoMoney(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
BigDecimal money = null;
-
if (StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())
|| goodsBrief.getCouponInfo().trim().equalsIgnoreCase("鏃�")) {
money = MoneyBigDecimalUtil.mul(
@@ -2065,6 +2099,24 @@
return token;
}
+ /**
+ * 鎻愬彇鑷湁鏍煎紡鐨勬窐鍙ｄ护
+ *
+ * @param str
+ * @return
+ */
+ public static String parseSystemTaoToken(String str) {
+ String pattern = "(\\({1}[A-Za-z0-9]+\\){1})";
+ Pattern r = Pattern.compile(pattern);
+ Matcher m = r.matcher(str);
+ while (m.find()) {
+ String group = m.group(0);
+ if (!StringUtil.isNullOrEmpty(group))
+ return group;
+ }
+ return null;
+ }
+
public static boolean isSpecialGoods(Integer materialLibType) {
if (materialLibType != null && materialLibType == 1)
return true;
--
Gitblit v1.8.0