From dcfd801ea435c1c87ed47f2ee24cdabaaf230d6f Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 31 三月 2020 12:15:56 +0800 Subject: [PATCH] 大淘客商品过滤修改 --- fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java | 41 +++++++++++++++++++++++++++++++---------- 1 files changed, 31 insertions(+), 10 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java index d9c77f6..38a3a07 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java @@ -28,6 +28,7 @@ import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; +import com.yeshi.fanli.util.VersionUtil; import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil; import com.yeshi.fanli.util.taobao.DaTaoKeUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; @@ -179,17 +180,8 @@ @Override public TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods) { - List<Long> goodsIdList = new ArrayList<>(); - goodsIdList.add(goods.getAuctionId()); - List<DaTaoKeDetailV2> daTaoKeList = listByGoodsIds(goodsIdList); - if (daTaoKeList == null || daTaoKeList.size() == 0) - return goods; - - // 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸 - goods = DaTaoKeUtil.filterTaoBaoGoods(goods, daTaoKeList.get(0)); - - return goods; + return filterTaoBaoGoods(goods, null, null); } @Override @@ -447,4 +439,33 @@ return daTaoKeGoodsDetailV2Dao.listBySellerId((int) start, count, sellerId); } + @Override + public DaTaoKeDetailV2 selectByAuctionId(Long auctionId) { + return daTaoKeGoodsDetailV2Dao.selectByAuctionId(auctionId); + } + + @Cacheable(value = "daTaoKeGoodsCache", key = "'selectByAuctionId-'+#auctionId") + @Override + public DaTaoKeDetailV2 selectByAuctionIdCache(Long auctionId) { + return selectByAuctionId(auctionId); + } + + @Override + public TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, String platform, String version) { + List<Long> goodsIdList = new ArrayList<>(); + goodsIdList.add(goods.getAuctionId()); + + List<DaTaoKeDetailV2> daTaoKeList = listByGoodsIds(goodsIdList); + if (daTaoKeList == null || daTaoKeList.size() == 0) + return goods; + + if (platform != null && version != null && VersionUtil.greaterThan_2_1(platform, version)) { + // 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸 + goods = DaTaoKeUtil.filterTaoBaoGoods(goods, daTaoKeList.get(0), true); + } else + goods = DaTaoKeUtil.filterTaoBaoGoods(goods, daTaoKeList.get(0), false); + + return goods; + } + } -- Gitblit v1.8.0