From a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 06 五月 2020 14:04:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 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 38a3a07..0a8accf 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
@@ -21,6 +21,7 @@
import com.yeshi.fanli.dao.goods.taobao.dataoke.DaTaoKeGoodsDetailV2Dao;
import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
import com.yeshi.fanli.dto.dataoke.DingDongQiangDTO;
+import com.yeshi.fanli.dto.taobao.DaTaoKeFilterResult;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.log.LogHelper;
@@ -28,7 +29,6 @@
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;
@@ -178,11 +178,6 @@
return goodsList;
}
- @Override
- public TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods) {
-
- return filterTaoBaoGoods(goods, null, null);
- }
@Override
public List<DaTaoKeDetailV2> listByIds(List<Long> idsList) {
@@ -451,21 +446,15 @@
}
@Override
- public TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, String platform, String version) {
+ public DaTaoKeFilterResult 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;
-
- 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;
+ return new DaTaoKeFilterResult(goods, DaTaoKeFilterResult.FILTER_TYPE_NONE);
+ // 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
+ return DaTaoKeUtil.filterTaoBaoGoods(goods, daTaoKeList.get(0), true);
}
}
--
Gitblit v1.8.0