From cf63bb9b554eabf478af71020bc9b7edc9f4ae6b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 17 五月 2020 19:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..c720981 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++) {
@@ -1136,10 +1139,10 @@
imgInfo0.setPid(pid);
imgInfo0.setUrl(info.getUrl());
imgInfo0.setUrlHD(info.getUrl());
- imgInfo0.setType(ImgEnum.img);
+ imgInfo0.setType(ImgEnum.activity);
imgInfo0.setW(info.getW());
imgInfo0.setH(info.getH());
-
+ imgInfo0.setActivityUrl(activityUrl);
if (i < tempList.size()) {
tempList.set(i, imgInfo0);
} else {
@@ -1148,6 +1151,7 @@
}
}
}
+
int lineNum = 0;
int totalImg = tempList.size();
@@ -1187,7 +1191,7 @@
}
}
- resultObj.setJumpLink(imgInfo.getActivityUrl());
+ resultObj.setJumpLink(activityUrl);
resultObj.setLineNum(lineNum);
resultObj.setImgList(listImg);
goodsEvaluateDao.save(resultObj);
@@ -1626,7 +1630,7 @@
}
// 鎸夌収鍙戝竷鏄剧ず鏃堕棿娈佃捣濮嬫椂闂翠负鍑嗐��
- goodsEvaluate.setPublishTime(goodsEvaluate.getStartTime());
+ evaluateNew.setPublishTime(evaluateNew.getStartTime());
List<CommentInfo> comments = evaluateNew.getComments();
if (comments != null && comments.size() > 0) {
--
Gitblit v1.8.0