From de4110d3d3944ffcd797fd8c43f0d455cc731f84 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 17 五月 2020 11:43:52 +0800
Subject: [PATCH] 活动详情
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 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 3246d69..21482fb 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
@@ -1103,6 +1103,7 @@
}
}
+ String activityUrl = imgInfo.getActivityUrl();
// 缂栬緫鍥剧墖
List<ImgInfo> tempList = new ArrayList<ImgInfo>();
if (!StringUtil.isNullOrEmpty(picUrls)) {
@@ -1114,6 +1115,7 @@
if (listOld != null) {
for (ImgInfo info: listOld) {
if (info.getUrl().equals(picLink)) {
+ info.setActivityUrl(activityUrl);
tempList.add(info);
break;
}
@@ -1124,6 +1126,7 @@
}
}
+
// 涓婁紶鏂囦欢鏇挎崲
if (fileRequest != null) {
for (int i = 0; i < 9; i++) {
@@ -1139,7 +1142,7 @@
imgInfo0.setType(ImgEnum.img);
imgInfo0.setW(info.getW());
imgInfo0.setH(info.getH());
-
+ imgInfo0.setActivityUrl(activityUrl);
if (i < tempList.size()) {
tempList.set(i, imgInfo0);
} else {
@@ -1187,7 +1190,7 @@
}
}
- resultObj.setJumpLink(imgInfo.getActivityUrl());
+ resultObj.setJumpLink(activityUrl);
resultObj.setLineNum(lineNum);
resultObj.setImgList(listImg);
goodsEvaluateDao.save(resultObj);
@@ -1626,8 +1629,48 @@
}
// 鎸夌収鍙戝竷鏄剧ず鏃堕棿娈佃捣濮嬫椂闂翠负鍑嗐��
- goodsEvaluate.setPublishTime(goodsEvaluate.getStartTime());
+ evaluateNew.setPublishTime(evaluateNew.getStartTime());
+
+ // 娲诲姩閾炬帴璺宠浆杩囨浮椤�
+ EvaluateEnum evaluateEnum = evaluateNew.getType();
+ if (evaluateEnum != null && evaluateEnum == EvaluateEnum.activity) {
+ if (evaluateNew.getComments() != null && evaluateNew.getComments().size() > 0) {
+ String jumpLink = configService.get(ConfigKeyEnum.activityDetailLink.getKey()) + "?type=%s&id=%s";
+ jumpLink = String.format(jumpLink, "circle", evaluateNew.getId());
+
+ if (!StringUtil.isNullOrEmpty(evaluateNew.getJumpLink())) {
+ evaluateNew.setJumpLink(jumpLink);
+ }
+ List<ImgInfo> imgListNew = new ArrayList<>();
+
+ List<ImgInfo> imgList = evaluateNew.getImgList();
+ if (imgList != null && imgList.size() > 0) {
+ for (ImgInfo imgInfo: imgList) {
+ if (imgInfo.getType() != ImgEnum.img || imgInfo.getType() == ImgEnum.activity) {
+ ImgInfo imgInfoNew = new ImgInfo();
+ try {
+ PropertyUtils.copyProperties(imgInfoNew, imgInfo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ continue;
+ }
+
+ if (!StringUtil.isNullOrEmpty(imgInfoNew.getActivityUrl())) {
+ imgInfoNew.setActivityUrl(jumpLink);
+ }
+
+ imgListNew.add(imgInfoNew);
+ continue;
+ }
+ imgListNew.add(imgInfo);
+ }
+ }
+ evaluateNew.setImgList(imgListNew);
+ }
+ }
+
+
List<CommentInfo> comments = evaluateNew.getComments();
if (comments != null && comments.size() > 0) {
EvaluateEnum typeEnum = evaluateNew.getType();
--
Gitblit v1.8.0