From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java
index 18b6fe2..92b95c7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.taobao;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -24,7 +25,9 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
+import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -41,9 +44,12 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
+
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
+
+ @Resource
+ private ConfigTaoLiJinService configTaoLiJinService;
@Override
public void addShareHotGoods(ShareHotGoods goods) {
@@ -70,8 +76,8 @@
goodsList.add(shg.getGoods());
}
- //杩囨护鍩烘湰鍟嗗搧淇℃伅
- goodsList=taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
+ // 杩囨护鍩烘湰鍟嗗搧淇℃伅
+ goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);
// 杩囨护涓嬬嚎鍟嗗搧
goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);
@@ -98,7 +104,15 @@
@Override
public List<TaoBaoGoodsBrief> listPreGoods(int page) {
- List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listPreShareHotGoods(page);
+ String warningValue = configTaoLiJinService.getValueByKey("warning_value",
+ new Date(TimeUtil.convertToTimeTemp(
+ TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"),
+ "yyyy-MM-dd")));
+
+ BigDecimal minComminsion = new BigDecimal(1)
+ .divide(new BigDecimal(warningValue).multiply(new BigDecimal("0.01")), 2, RoundingMode.UP);
+
+ List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listPreShareHotGoods(page, minComminsion);
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
if (list != null) {
for (DaTaoKeDetailV2 v2 : list)
--
Gitblit v1.8.0