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/TLJBuyGoodsServiceImpl.java | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java index d2be2a5..73efe60 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java @@ -11,7 +11,6 @@ import javax.annotation.Resource; -import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.ehcache.EhCacheCacheManager; import org.springframework.stereotype.Service; @@ -30,7 +29,6 @@ import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService; import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; -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; @@ -48,9 +46,6 @@ @Resource private TaoBaoGoodsBriefService taoBaoGoodsBriefService; - - @Resource - private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService; @Resource private EhCacheCacheManager ehCacheCacheManager; @@ -135,7 +130,7 @@ // 杩囨护涓嬬嚎鍟嗗搧 goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList); // 娣诲姞澶ф窐瀹俊鎭� - goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList); + goodsList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goodsList); Map<Long, TaoBaoGoodsBrief> goodsMap = new HashMap<>(); if (goodsList != null) for (TaoBaoGoodsBrief g : goodsList) -- Gitblit v1.8.0