java110 3 lat temu
rodzic
commit
c42adc28d6

+ 15 - 8
service-common/src/main/java/com/java110/common/cmd/advert/ListAdvertPhotoCmd.java

@@ -96,16 +96,23 @@ public class ListAdvertPhotoCmd extends Cmd {
 
             for (AdvertItemDto tmpAdvertItemDto : advertItemDtos) {
                 //照片
-                if ("8888".equals(tmpAdvertItemDto.getItemTypeCd())) {
-                    photoAndVideo = new JSONObject();
-                    photoAndVideo.put("suffix", "JPEG");
-                    //photoAndVideo.put("url", "/callComponent/download/getFile/file?fileId=" + tmpAdvertItemDto.getUrl() + "&communityId=" + advertDto.getCommunityId());
+                if (!"8888".equals(tmpAdvertItemDto.getItemTypeCd())) {
+                    continue;
+                }
+
+                photoAndVideo = new JSONObject();
+                photoAndVideo.put("suffix", "JPEG");
+                //photoAndVideo.put("url", "/callComponent/download/getFile/file?fileId=" + tmpAdvertItemDto.getUrl() + "&communityId=" + advertDto.getCommunityId());
+                if(tmpAdvertItemDto.getUrl().startsWith("http")){
+                    photoAndVideo.put("url", tmpAdvertItemDto.getUrl());
+                }else{
                     photoAndVideo.put("url", imgUrl + tmpAdvertItemDto.getUrl());
-                    photoAndVideo.put("seq", tmpAdvertItemDto.getSeq());
-                    photoAndVideo.put("advertType", advertDto.getAdvertType());
-                    photoAndVideo.put("pageUrl", advertDto.getPageUrl());
-                    advertPhotoAndVideos.add(photoAndVideo);
                 }
+                photoAndVideo.put("url", imgUrl + tmpAdvertItemDto.getUrl());
+                photoAndVideo.put("seq", tmpAdvertItemDto.getSeq());
+                photoAndVideo.put("advertType", advertDto.getAdvertType());
+                photoAndVideo.put("pageUrl", advertDto.getPageUrl());
+                advertPhotoAndVideos.add(photoAndVideo);
             }
         }