From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java
index ac1bf1d..2cd3123 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java
@@ -16,20 +16,19 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.taobao.TLJFreeBuyGoodsDao;
-import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
+import com.yeshi.goods.facade.dto.taobao.dataoke.DaTaoKeGoodsResult;
import com.yeshi.fanli.entity.taobao.TLJFreeBuyGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TLJFreeBuyGoodsService;
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.goods.facade.service.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
-import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
+import org.yeshi.utils.TimeUtil;
+import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@Service
@@ -43,8 +42,6 @@
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
- @Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
@Resource
private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@@ -71,7 +68,7 @@
}
- //@Cacheable(value = "commonContentCache", key = "'tljFreeBuy-listByDay'+#day")
+ @Cacheable(value = "commonContentCache", key = "'tljFreeBuy-listByDay'+#day")
@Override
public List<TLJFreeBuyGoods> listByDay(String day) {
List<TLJFreeBuyGoods> list = listByDay(day, 10);
@@ -79,7 +76,7 @@
for (int i = 0; i < list.size(); i++) {
// 杩囨护娣樼ぜ閲戝ぇ浜�10鍧楅挶鐨�
BigDecimal hongBao = TaoBaoUtil.getGoodsHongBaoMoney(list.get(i).getGoods(),
- TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);
if (hongBao.compareTo(new BigDecimal(10)) > 0) {
list.remove(i--);
}
@@ -114,7 +111,7 @@
// 杩囨护涓嬬嚎鍟嗗搧
goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);
// 娣诲姞澶ф窐瀹俊鎭�
- goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);
+ goodsList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goodsList);
Map<Long, TaoBaoGoodsBrief> goodsMap = new HashMap<>();
if (goodsList != null)
@@ -164,7 +161,10 @@
public List<TaoBaoGoodsBrief> listPreGoods(String key ,int page) {
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
// 澶ф窐瀹㈢瓫閫夛細 鍒稿悗浠� 1-2鍖洪棿 銆佺患鍚堟帓搴�
- DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, new BigDecimal(1), new BigDecimal(2), 1, page, 100, 0);
+// DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, new BigDecimal(1), new BigDecimal(2), 1, page, 100, 0);
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.getGoodsList(key, null, new BigDecimal(1), new BigDecimal(2), 1, page, 100, 0);
+
+
if (result != null && result.getGoodsList() != null) {
for (DaTaoKeDetailV2 v2 : result.getGoodsList())
goodsList.add(TaoBaoUtil.convert(v2));
--
Gitblit v1.8.0