From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index 3255708..a426347 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -42,6 +42,7 @@
 import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoLink;
+import com.yeshi.fanli.exception.goods.ConvertLinkExceptionException;
 import com.yeshi.fanli.exception.share.ShareGoodsException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
@@ -799,7 +800,7 @@
 				// 鍗曞搧
 				if (goodsEvaluate.getType() == EvaluateEnum.single) {
 					for (ImgInfo imgInfo : imgs) {
-						if (type == 3 && imgInfo.getType() == ImgEnum.video)
+						if (imgInfo.getType() == ImgEnum.video)
 							continue;
 
 						GoodsDetailVO goodsVO = imgInfo.getGoodsVO();
@@ -972,8 +973,14 @@
 			}
 		}
 
+		String newText =  text;
 		try {
-			text = convertLinkManager.convertLinkFromText(text, uid, true);
+			newText = convertLinkManager.convertLinkFromText(text, uid, true);
+		} catch (ConvertLinkExceptionException e) {
+			if (e.getCode() != ConvertLinkExceptionException.CODE_NONE) {
+				out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
+				return;
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			out.print(JsonUtil.loadFalseResult("璇勮鐢熸垚澶辫触"));
@@ -981,7 +988,7 @@
 		}
 
 		JSONObject data = new JSONObject();
-		data.put("text", text);
+		data.put("text", newText);
 		out.print(JsonUtil.loadTrueResult(data));
 	}
 

--
Gitblit v1.8.0