From 47f157086a556d96e7bcfc9adfe17ecf7c154dfe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 08 六月 2020 17:27:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
index e7624a3..aa5a94d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -41,6 +41,7 @@
 import com.yeshi.fanli.service.inter.homemodule.SpecialCardService;
 import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;
 import com.yeshi.fanli.service.inter.homemodule.SpecialService;
+import com.yeshi.fanli.service.manger.goods.ConvertLinkManager;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.FilePathEnum;
 import com.yeshi.fanli.util.StringUtil;
@@ -72,6 +73,9 @@
 
 	@Resource
 	private AppVersionService appVersionService;
+	
+	@Resource
+	private ConvertLinkManager convertLinkManager;
 
 	@Resource
 	private AdActivityVersionControlService adActivityVersionControlService;
@@ -717,10 +721,17 @@
 					String link = configService.get(ConfigKeyEnum.activityDetailLink.getKey()) + "?type=%s&id=%s";
 					link = String.format(link, CommonShareInfoEnum.special.name(),specialVO.getId());
 					
+					// 璺宠浆閾炬帴
 					JSONObject params = new JSONObject();
 					params.put("url", link);
 					
-					specialVO.setComment(info.getComment());
+					// 鏇挎崲娣樺疂瀹樻柟娲诲姩
+					String comment = info.getComment();
+					List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(comment);
+					for (String st : activityIdList)
+						comment = comment.replace(st, "");
+
+					specialVO.setComment(comment);
 					specialVO.setParams(params.toString());
 					specialVO.setJumpDetail(jumpDetailV2Service.getByTypeCache("web"));
 				}

--
Gitblit v1.8.0