From 2f5935ed11672046c37f733d855214f6147b4b58 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 28 三月 2022 11:33:19 +0800
Subject: [PATCH] TDMQ兼容

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
index 5930f8e..6048a09 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java
@@ -25,7 +25,7 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoLink;
 import com.yeshi.fanli.exception.dynamic.ActivityUserException;
 import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
-import com.yeshi.fanli.exception.goods.ConvertLinkExceptionException;
+import com.yeshi.fanli.exception.goods.ConvertLinkException;
 import com.yeshi.fanli.exception.taobao.TaoBaoConvertLinkException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
@@ -997,8 +997,8 @@
         if (!StringUtil.isNullOrEmpty(content) && commentInfo.getNeedSpin()) {
             try {
                 convertLinkManager.convertLinkFromText(system, content, Constant.LINK_TOKEN_VERIFY_UID, true, false);
-            } catch (ConvertLinkExceptionException e) {
-                if (ConvertLinkExceptionException.CODE_NONE != e.getCode()) {
+            } catch (ConvertLinkException e) {
+                if (ConvertLinkException.CODE_NONE != e.getCode()) {
                     throw new GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴");
                 }
             } catch (Exception e) {
@@ -1721,7 +1721,7 @@
                                 for (String st : activityIdList)
                                     content = content.replace(st, "");
                                 content = content.replace("{relationId}", "");
-                                if (system == SystemEnum.yhqjx) {
+                                if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
                                     content = content.replace("\n", "<br>");
                                 }
                                 commentInfoNew.setContent(content);
@@ -1813,7 +1813,7 @@
                                     simpleGoods.setState(1);
                                     simpleGoods.setRemarks("璇勮楠岃瘉涓嬫灦");
                                 }
-                                if (system == SystemEnum.yhqjx) {
+                                if (system == SystemEnum.yhqjx || system == SystemEnum.hsb) {
                                     imgInfo.setGoods(null);
                                 }
                             }
@@ -2327,7 +2327,7 @@
                         if (goodsBrief != null && goodsBrief.getImgList() != null) {
                             GoodsMoneyConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
                             goods = GoodsDetailVOFactory.convertTaoBao(goodsBrief, params);
-                            goods = goodsLijinMnager.loadTBMoneyInfo(system, null, goodsBrief, goods,false);
+                            goods = goodsLijinMnager.loadTBMoneyInfo(system, null, goodsBrief, goods, false);
                             for (String img : goodsBrief.getImgList()) {
                                 if (!imgSet.contains(img) && imgs.size() < 9) {
                                     imgSet.add(img);

--
Gitblit v1.8.0