瀏覽代碼

Merge remote-tracking branch 'origin/master'

yumeng 10 月之前
父節點
當前提交
598b7ad5a6

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/open/entity/KuaishouOpenPhotoList.java

@@ -45,7 +45,7 @@ public class KuaishouOpenPhotoList {
     /**
      * 作品创建时间
      */
-    private String photoCreateTime;
+    private Long photoCreateTime;
 
     /**
      * 作品点赞数

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/open/service/impl/KuaishouOpenPhotoListServiceImpl.java

@@ -88,7 +88,7 @@ public class KuaishouOpenPhotoListServiceImpl implements IKuaishouOpenPhotoListS
                         minPhotoId = photo.getPhotoId();
                     }
                     photo.setPromoterId(userId);
-                    photo.setPhotoCreateTime(DateUtils.timestamptoMinutesAndSecondsStr(obj.getLong("createTime")));
+                    photo.setPhotoCreateTime(Long.valueOf(DateUtils.timestamptoStr(obj.getLong("createTime"))));
                     photo.setPending(String.valueOf(obj.getBoolean("pending") ? 1 : 0));
                     list.add(photo);
                 }