From b3da9f82b7740d39742fef1a81a56c22fe1c8b9c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:27:02 +0800
Subject: [PATCH] 券后价调整
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 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 ade2758..51e2656 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
@@ -7,6 +7,7 @@
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -44,6 +45,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.common.ImageInfo;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.taobao.SearchFilter;
@@ -738,7 +740,7 @@
hongBaoInfo.setRate("鏈�楂�40%");
- String hongbao = getGoodsHongBaoInfo(tb, new BigDecimal(proportion));
+ String hongbao = getGoodsHongBaoInfo(tb, new BigDecimal(proportion), false);
if (hongbao.contains("鏈�楂�")) {
hongBaoInfo.setType(1);
hongBaoInfo.setHongbao(new BigDecimal(0));
@@ -1021,7 +1023,7 @@
tg.setTaoBaoQuanInfo(quanInfo);
}
- BigDecimal proportion = taoBaoUtil.manageService.getFanLiRate();
+ BigDecimal proportion = taoBaoUtil.manageService.getFanLiRate(UserLevelEnum.daRen);
TaoBaoHongBaoInfo hongBaoInfo = new TaoBaoHongBaoInfo();
String tkMktStatus = tb.getTkMktStatus();
if ("1".equals(tkMktStatus)) {
@@ -1030,7 +1032,7 @@
hongBaoInfo.setRate("鏈�楂�40%");
- String hongbao = getGoodsHongBaoInfo(tb, proportion);
+ String hongbao = getGoodsHongBaoInfo(tb, proportion, false);
if (!hongbao.contains("鏈�楂�"))
hongBaoInfo.setHongbao(new BigDecimal(hongbao.replace("楼", "")));
else
@@ -1406,12 +1408,12 @@
* 鐢ㄦ埛鍐嶆鍒嗘垚姣斾緥锛�0-100锛�
* @return
*/
- public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
+ public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate, boolean share) {
// if (goodsBrief != null && goodsBrief.getMaterialLibType() != null &&
// goodsBrief.getMaterialLibType() == 0)
// return "楼0.00";
// else
- return "楼" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
+ return "楼" + getGoodsHongBaoMoney(goodsBrief, rate, share).toString();
}
/**
@@ -1421,7 +1423,7 @@
* @param rate
* @return
*/
- public static BigDecimal getGoodsHongBaoMoney(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
+ public static BigDecimal getGoodsHongBaoMoney(TaoBaoGoodsBrief goodsBrief, BigDecimal rate, boolean share) {
BigDecimal money = null;
if (StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())
|| goodsBrief.getCouponInfo().trim().equalsIgnoreCase("鏃�")) {
@@ -1447,6 +1449,10 @@
new BigDecimal("0.01")), MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
}
}
+
+ if (share)
+ money = TaoBaoUtil.getCanShareMoney(new Date(), money);
+
return BigDecimalUtil.getWithNoZera(money);
}
@@ -1481,7 +1487,7 @@
*/
public static BigDecimal getShareGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
- return getGoodsHongBaoMoney(goodsBrief, rate);
+ return getGoodsHongBaoMoney(goodsBrief, rate, true);
}
/**
@@ -2177,4 +2183,23 @@
return urlList;
}
+ /**
+ * 鑾峰彇鑳藉鍒嗙殑閽�
+ * @Title: getCanShareMoney
+ * @Description:
+ * @param estimate
+ * @return
+ * BigDecimal 杩斿洖绫诲瀷
+ * @throws
+ */
+ public static BigDecimal getCanShareMoney(Date createTime, BigDecimal estimate) {
+ if (estimate == null)
+ return null;
+ if (createTime.getTime() < TimeUtil.convertToTimeTemp("2020-06-01 12:30:00", "yyyy-MM-dd HH:mm:ss")) {
+ return estimate;
+ }
+ BigDecimal rate = new BigDecimal("0.9101");
+ return MoneyBigDecimalUtil.mul(estimate, rate);
+ }
+
}
--
Gitblit v1.8.0