From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 090cf6b..dd156d1 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
@@ -49,13 +49,12 @@
import com.yeshi.fanli.entity.dynamic.SimpleGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
+import com.yeshi.goods.facade.entity.taobao.dataoke.DaTaoKeDetailV2;
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.share.ShareGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityUserService;
@@ -64,15 +63,15 @@
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
+import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service;
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.FileUtil;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -83,7 +82,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.goods.CouponInfoVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
-import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.common.vo.ClientTextStyleVO;
@Service
public class GoodsEvaluateServiceImpl implements GoodsEvaluateService {
@@ -557,7 +556,7 @@
couponUrl = couponInfo.getLink();
}
String materialId = "https://item.jd.com/" + goodsId + ".html";
- String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl,
+ String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl,null,
JDApiUtil.POSITION_SHARE + "", "1");
String template = configService.getValue(ConfigKeyEnum.quickShareJDCommentText.getKey(), system);
if (jumpLink == null) {
@@ -625,7 +624,7 @@
couponUrl = couponInfo.getLink();
}
String materialId = "https://item.jd.com/" + goodsDetailVO.getGoodsId() + ".html";
- String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "",
+ String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null,JDApiUtil.POSITION_SHARE + "",
"1");
String template = configService.getValue(ConfigKeyEnum.quickShareJDCommentText.getKey(), system);
commentText = template.replace("[閾炬帴]", jumpLink);
@@ -908,7 +907,7 @@
}
} else if (i == 0 && kind == 1) {
try {
- convertLinkManager.convertLinkFromText(content, Constant.LINK_TOKEN_VERIFY_UID, true);
+ convertLinkManager.convertLinkFromText(content, Constant.LINK_TOKEN_VERIFY_UID, true,false);
} catch (Exception e) {
throw new GoodsEvaluateException(1, "涓嶅寘鍚彲杞摼鐨勫彛浠や笌閾炬帴");
}
@@ -978,7 +977,7 @@
String content = commentInfo.getContent();
if (!StringUtil.isNullOrEmpty(content) && commentInfo.getNeedSpin()) {
try {
- convertLinkManager.convertLinkFromText(content, Constant.LINK_TOKEN_VERIFY_UID, true);
+ convertLinkManager.convertLinkFromText(content, Constant.LINK_TOKEN_VERIFY_UID, true,false);
} catch (ConvertLinkExceptionException e) {
if (ConvertLinkExceptionException.CODE_NONE != e.getCode()) {
throw new GoodsEvaluateException(1, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴");
@@ -1638,7 +1637,7 @@
}
@Override
- @Cacheable(value = "dynamicCache", key = "'queryMaterialsCache-'+#start+'-'+#type")
+ @Cacheable(value = "dynamicCache", key = "'queryMaterialsCache-'+#start+'-'+#type+'-'+#system")
public List<GoodsEvaluate> queryMaterialsCache(int start, int count, int type, SystemEnum system) throws Exception {
List<GoodsEvaluate> list = goodsEvaluateDao.queryValid(start, count, type, system);
if (list == null) {
@@ -1701,7 +1700,7 @@
List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(content);
for (String st : activityIdList)
content = content.replace(st, "");
-
+ content=content.replace("{relationId}","");
commentInfoNew.setContent(content);
}
}
@@ -1712,6 +1711,8 @@
List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(content);
for (String st : activityIdList)
content = content.replace(st, "");
+ content=content.replace("{relationId}","");
+
commentInfoNew.setContent(content);
}
@@ -2077,6 +2078,7 @@
goodsEvaluate.setLineNum(lineNum);
goodsEvaluate.setImgList(imgList);
goodsEvaluate.setComments(commentsNew);
+ goodsEvaluate.setSystem(system);
goodsEvaluateDao.save(goodsEvaluate);
}
@@ -2231,6 +2233,7 @@
goodsEvaluate.setLineNum(lineNum);
goodsEvaluate.setImgList(imgList);
goodsEvaluate.setComments(commentsNew);
+ goodsEvaluate.setSystem(system);
goodsEvaluateDao.save(goodsEvaluate);
return result;
}
@@ -2348,6 +2351,7 @@
goodsEvaluate.setPublishTime(new Date());
goodsEvaluate.setCreateTime(new Date());
goodsEvaluate.setUpdateTime(new Date());
+ goodsEvaluate.setSystem(system);
List<String> goodsimgs = goodsBrief.getImgList();
--
Gitblit v1.8.0