From 5879fd8d7e0cc7cfb94a036545dd515381fc3e70 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期三, 01 一月 2020 10:21:31 +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/TLJFreeBuyGoodsServiceImpl.java | 5 +---- 1 files changed, 1 insertions(+), 4 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 c2e917d..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; @@ -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