From 106a09463e66ffe39383bdab28f501ec47b5fcc4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 18 五月 2020 14:07:16 +0800
Subject: [PATCH] 最新订单号

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/GoodsEvaluateServiceImpl.java |   43 ++-----------------------------------------
 1 files changed, 2 insertions(+), 41 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 21482fb..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
@@ -1139,7 +1139,7 @@
 					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);
@@ -1151,6 +1151,7 @@
 				} 
 			}
 		}
+		
 		
 		int lineNum = 0;
 		int totalImg = tempList.size();
@@ -1631,46 +1632,6 @@
 			// 鎸夌収鍙戝竷鏄剧ず鏃堕棿娈佃捣濮嬫椂闂翠负鍑嗐��
 			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