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/controller/client/v2/GoodsControllerV2.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index 2114962..49e012f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -42,6 +42,7 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoShop;
 import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
 import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
 import com.yeshi.fanli.exception.taobao.TaoKeApiException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
@@ -199,7 +200,7 @@
 
 	@Resource
 	private UserVipConfigService userVipConfigService;
-	
+
 	@Resource
 	private GoodsEvaluateService goodsEvaluateService;
 
@@ -265,6 +266,7 @@
 					app.setPid(TaoBaoConstant.TAOBAO_COMMON_PID);
 					app.setAdzoneId(TaoBaoConstant.TAOBAO_COMMON_PID.split("_")[3]);
 					goods = TaoKeApiUtil.searchGoodsDetail(id, app);
+
 					final TaoBaoGoodsBrief finalGoods = goods;
 					if (goods != null) {
 						ThreadUtil.run(new Runnable() {
@@ -371,7 +373,8 @@
 
 		// 澶ф窐瀹㈠晢鍝佽繃婊�
 		try {
-			goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);
+			goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods, acceptData.getPlatform(),
+					acceptData.getVersion());
 		} catch (Exception e) {
 			LogHelper.errorDetailInfo(e);
 		}
@@ -613,7 +616,7 @@
 	 */
 	@RequestMapping(value = "getDetailJD")
 	public void getDetialJD(AcceptData acceptData, Long id, Long uid, String from, PrintWriter out) {
-//		uid=2255993L;
+		// uid=2255993L;
 		// 绯荤粺楠岃瘉
 		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
 				acceptData.getPackages());
@@ -809,7 +812,7 @@
 		out.print(JsonUtil.loadTrueResult(object.toString()));
 
 		final JDGoods goods = jdGoods;
-		final Long fuid=uid;
+		final Long fuid = uid;
 		ThreadUtil.run(new Runnable() {
 			public void run() {
 				// 娣诲姞娴忚璁板綍
@@ -818,7 +821,7 @@
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-				
+
 				try {
 					goodsEvaluateService.updateJDGoods(goods);
 				} catch (Exception e) {
@@ -1002,7 +1005,7 @@
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-				
+
 				try {
 					goodsEvaluateService.updatePDDGoods(pddGoods);
 				} catch (Exception e) {

--
Gitblit v1.8.0