From 8fd3db7778b3991810d33ac4dffd2f9031b106fc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 16:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java
index a862552..9370cdd 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/VideoVO.java
@@ -30,6 +30,10 @@
@ApiModelProperty("鍥剧墖灏侀潰")
private String coverUrl;
+ /** 灏侀潰鏄剧ず鍦板潃 */
+ @ApiModelProperty("灏侀潰鏄剧ず鍦板潃")
+ private String coverShowUrl;
+
/** 瑙嗛鍦板潃 */
@ApiModelProperty("瑙嗛鍦板潃")
private String videoFileKey;
@@ -37,6 +41,18 @@
@ApiModelProperty("瑙嗛鏍囩")
private List<SimpleVideoTagVO> tagList;
+
+ @ApiModelProperty("瑙嗛鍐呭绫诲瀷锛氳棰戙�佸浘鐗�")
+ private String videoContentType;
+
+ @ApiModelProperty("瑙嗛绫诲瀷锛氳棰戙�佸ぇ鍋ュ悍銆佺鍘�")
+ private String videoType;
+
+ @ApiModelProperty(value = "鍥剧墖鍒楄〃锛宩son鏁扮粍", hidden = true)
+ private String videoImgs;
+
+ @ApiModelProperty("鍥剧墖鍒楄〃")
+ private List<String> imgs;
/** 瑙嗛濉厖妯″紡 */
@ApiModelProperty("瑙嗛濉厖妯″紡")
@@ -51,15 +67,7 @@
/** 鍟嗗搧id */
@ApiModelProperty("鍟嗗搧id")
- private String goodsId;
-
- /** 鍟嗗搧鏌ョ湅娆℃暟 */
- @ApiModelProperty("鍟嗗搧鏌ョ湅娆℃暟")
- private Long goodsViewNum;
-
- /** 鍟嗗搧涓嬪崟娆℃暟 */
- @ApiModelProperty("鍟嗗搧涓嬪崟娆℃暟")
- private Long goodsOrderNum;
+ private List<VideoGoodsDetailVO> goodsList;
/** 鏄惁鎺ㄨ崘 */
@ApiModelProperty("鏄惁鎺ㄨ崘")
@@ -71,15 +79,19 @@
/** 鎾斁閲� */
@ApiModelProperty("鎾斁閲�")
- private Long playNum;
+ private Integer playNum;
/** 鏀惰棌鏁� */
@ApiModelProperty("鏀惰棌鏁�")
- private Long collectNum;
+ private Integer collectNum;
/** 璇勮鏁� */
@ApiModelProperty("璇勮鏁�")
- private Long commentNum;
+ private Integer commentNum;
+
+ /** 鐐硅禐鏁� */
+ @ApiModelProperty("鐐硅禐鏁�")
+ private Integer thumbsUpNum;
/** 鏉冮噸 */
@ApiModelProperty("鏉冮噸")
@@ -89,6 +101,8 @@
@ApiModelProperty("瀹℃牳閫氳繃鏃堕棿")
private Date auditPassTime;
+
+
public static VideoVO getVoByEntity(@NonNull Video entity, VideoVO vo) {
if(vo == null) {
vo = new VideoVO();
--
Gitblit v1.8.0