From d97129d4fad83851cee8bf3cfe0b67063c61a305 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 19 十二月 2018 12:06:36 +0800
Subject: [PATCH] 商品下架CommonGoods处理

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 02218ce..16fe6ab 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -161,8 +161,6 @@
 	@Resource
 	private SystemConfigService systemConfigService;
 
-
-
 	@Resource
 	private CollectionGoodsV2Service collectionGoodsV2Service;
 
@@ -306,7 +304,7 @@
 	@RequestMapping(value = "getHonestList")
 	public void getHonestList(AcceptData acceptData, PrintWriter out) {
 		System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
-		List<Honest> honestList =null;
+		List<Honest> honestList = null;
 		List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
 		if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform()))
 				|| ("ios".equalsIgnoreCase(acceptData.getPlatform())
@@ -704,8 +702,10 @@
 
 			data.put("tbPidInfo", clientTBPid);
 
+			JSONObject taobaoJson = JSONObject.fromObject(gson.toJson(taoBaoGoodsBriefExtra));
+			taobaoJson.put("imgList", taoBaoGoodsBriefExtra.getImgList());
 			// taoBaoGoodsBriefExtra.setAuctionUrl(null);
-			data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));
+			data.put("taobao", taobaoJson);
 			String info = configService.get("detail_prompt");
 			data.put("info", info);
 			String onlyInfo = configService.get("only_info");
@@ -1355,16 +1355,18 @@
 
 		/**
 		 * 闃叉璇锋眰棰戠巼杩囬珮
+		 * 
 		 */
-		String key = "linkParse-" + acceptData.getDevice() + "-" + id;
+		if (Constant.IS_OUTNET) {
+			String key = "linkParse-" + acceptData.getDevice() + "-" + id;
 
-		String value = redisManager.getCommonString(key);
-		if (!StringUtil.isNullOrEmpty(value)) {
-			out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
-			return;
+			String value = redisManager.getCommonString(key);
+			if (!StringUtil.isNullOrEmpty(value)) {
+				out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
+				return;
+			}
+			redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
 		}
-		redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
-
 		TaoBaoGoodsBrief goods = null;
 		try {
 			goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
@@ -1796,7 +1798,7 @@
 						// 鍟嗗搧涓嬫灦
 						ThreadUtil.run(new Runnable() {
 							public void run() {
-								taoBaoGoodsUpdateService.deleteTaoBaoGoods(Long.parseLong(id));
+								taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
 							}
 						});
 
@@ -1823,7 +1825,11 @@
 					} catch (NumberFormatException e) {
 						e.printStackTrace();
 					} catch (TaobaoGoodsDownException e) {
-						e.printStackTrace();
+						ThreadUtil.run(new Runnable() {
+							public void run() {
+								taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
+							}
+						});
 					}
 
 				}

--
Gitblit v1.8.0