yujian
2020-05-18 106a09463e66ffe39383bdab28f501ec47b5fcc4
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();