From 84dd8c1579ea198aff6ca8afac05a5e8f6af9faf Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 21 五月 2021 10:46:22 +0800
Subject: [PATCH] 淘礼金功能完善
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 59 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 27 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 b04e76d..6e6efe9 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
@@ -32,7 +32,7 @@
import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.dao.dynamic.GoodsEvaluateDao;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
@@ -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.goods.facade.entity.taobao.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 {
@@ -427,7 +426,7 @@
GoodsDetailVO goodsDetailVO = null;
JDGoods jdGoods = null;
PDDGoodsDetail pddGoods = null;
- ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ GoodsMoneyConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
try {
@@ -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) {
@@ -565,7 +564,8 @@
}
commentText = template.replace("[閾炬帴]", jumpLink);
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
- String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(Long.parseLong(goodsId), PinDuoDuoApiUtil.PID_SHARE + "", "1");
+ PDDGoodsDetail goodsDetail = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(goodsId), PinDuoDuoApiUtil.PID_SHARE + "", "1");
+ String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(goodsDetail.getGoodsSign(), PinDuoDuoApiUtil.PID_SHARE + "", "1");
if (jumpLink == null) {
throw new GoodsEvaluateException(1, "璇ュ晢鍝佽浆閾惧け璐�");
}
@@ -625,12 +625,15 @@
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);
} else if (goodsDetailVO.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
- String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(Long.parseLong(goodsDetailVO.getGoodsId()),
+ PDDGoodsDetail goodsDetail = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(goodsDetailVO.getGoodsId()),
+ PinDuoDuoApiUtil.PID_SHARE + "", "1");
+
+ String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(goodsDetail.getGoodsSign(),
PinDuoDuoApiUtil.PID_SHARE + "", "1");
String template = configService.getValue(ConfigKeyEnum.quickSharePDDCommentText.getKey(), system);
commentText = template.replace("[閾炬帴]", jumpLink);
@@ -649,7 +652,7 @@
public GoodsDetailVO getGoodsDetailVO(Long goodsId, Integer goodsType, SystemEnum system) throws GoodsEvaluateException {
GoodsDetailVO goodsDetail = null;
- ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ GoodsMoneyConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
try {
@@ -908,7 +911,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 +981,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, "鍖呭惈涓嶅彲杞摼鐨勫彛浠や笌閾炬帴");
@@ -1701,7 +1704,7 @@
List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(content);
for (String st : activityIdList)
content = content.replace(st, "");
-
+ content = content.replace("{relationId}", "");
commentInfoNew.setContent(content);
}
}
@@ -1712,6 +1715,8 @@
List<String> activityIdList = convertLinkManager.getTaoBaoOfficialActivityId(content);
for (String st : activityIdList)
content = content.replace(st, "");
+ content = content.replace("{relationId}", "");
+
commentInfoNew.setContent(content);
}
@@ -1823,7 +1828,7 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (GoodsEvaluate goodsEvaluate : list) {
- ConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", goodsEvaluate.getSystem());
+ GoodsMoneyConfigParamsDTO params = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", goodsEvaluate.getSystem());
params.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(goodsEvaluate.getSystem()));
// 鏄惁2涓皬鏃朵箣鍐呭凡鏇存柊
Date updateTime = goodsEvaluate.getUpdateTime();
@@ -1916,7 +1921,7 @@
}
}
- private GoodsDetailVO getGoodsNewInfo(String goodsId, int goodsType, ConfigParamsDTO paramsDTO) {
+ private GoodsDetailVO getGoodsNewInfo(String goodsId, int goodsType, GoodsMoneyConfigParamsDTO paramsDTO) {
GoodsDetailVO vo = null;
if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
TaoBaoGoodsBrief goods;
@@ -1977,7 +1982,7 @@
imgs.addAll(goodsBrief.getImgList());
// 鍟嗗搧VO
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
@@ -2102,7 +2107,7 @@
}
// 鍟嗗搧VO
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
@@ -2289,7 +2294,7 @@
return false;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO);
@@ -2519,7 +2524,7 @@
if (queryExist == null || queryExist.size() == 0) {
continue;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
updateGoods(queryExist, goodsNew);
@@ -2541,7 +2546,7 @@
continue;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertJDGoods(jdGoods, paramsDTO);
@@ -2560,7 +2565,7 @@
continue;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertPDDGoods(pddGoods, paramsDTO);
updateGoods(queryExist, goodsNew);
@@ -2579,7 +2584,7 @@
continue;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertVIPGoods(goods, paramsDTO);
updateGoods(queryExist, goodsNew);
@@ -2597,7 +2602,7 @@
if (queryExist == null || queryExist.size() == 0) {
continue;
}
- ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55", system);
paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate(system));
GoodsDetailVO goodsNew = GoodsDetailVOFactory.convertSuningGoods(goods, paramsDTO);
updateGoods(queryExist, goodsNew);
--
Gitblit v1.8.0