From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 e2794ad..87f20f3 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
@@ -24,7 +24,6 @@
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.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -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);
@@ -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)
--
Gitblit v1.8.0