From 09c1e21cad0b474babb1d2f67f481b582adf0b0f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 29 七月 2025 14:43:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
index 04a8b16..9cc98f7 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
@@ -427,6 +427,12 @@
page.getRecords().forEach(v -> {
v.setTagList(tagMap.get(v.getId()));
v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverUrl()));
+ v.getGoodsList().forEach(goods ->{
+ if (StringUtils.isNotBlank(goods.getThumbnail())&&!goods.getThumbnail().contains("http")) {
+ goods.setThumbnail(cosUtil.getPreviewUrl(goods.getThumbnail()));
+ }
+
+ });
});
}
return Result.ok().data(page.getRecords()).total(page.getTotal());
@@ -552,8 +558,15 @@
case "recommend":// 鍔犺浇鎺ㄨ崘瑙嗛
baseMapper.recommendVideo(page, query);
//鎺ㄨ崘瑙嗛閲嶆柊鎺掑簭
+ WxVideoVO wxVideoVO = null;
+ if (StringUtils.isNotBlank(query.getVideoId())) {
+ wxVideoVO = baseMapper.recommendVideoByVideoId(query);
+ }
List<WxVideoVO> records = page.getRecords();
Collections.shuffle(records);
+ if (wxVideoVO!=null) {
+ records.set(0, wxVideoVO);
+ }
break;
case "author": // 鍔犺浇瑙嗛涓婚〉鎴戝彂甯冪殑瑙嗛
AuthorVideoQuery query1 = new AuthorVideoQuery();
@@ -638,7 +651,7 @@
* @param mysqlNum
* @return
*/
- private Integer getCommentNum(String videoId, Integer mysqlNum) {
+ public Integer getCommentNum(String videoId, Integer mysqlNum) {
Object redisNum = cache.get(CachePrefix.VIDEO_COMMENT_NUM.getPrefixWithId(videoId));
if (Objects.isNull(redisNum)) {
// redis涓病鏈夊氨鎶婃暟鎹簱鐨勫啓鍒皉edis涓�
@@ -655,7 +668,7 @@
* @param mysqlNum
* @return
*/
- private Integer getCollectNum(String videoId, Integer mysqlNum) {
+ public Integer getCollectNum(String videoId, Integer mysqlNum) {
Object redisNum = cache.get(CachePrefix.VIDEO_COLLECT_NUM.getPrefixWithId(videoId));
if (Objects.isNull(redisNum)) {
// redis涓病鏈夊氨鎶婃暟鎹簱鐨勫啓鍒皉edis涓�
@@ -672,7 +685,7 @@
* @param mysqlNum
* @return
*/
- private Integer getThumbsUpNum(String videoId, Integer mysqlNum) {
+ public Integer getThumbsUpNum(String videoId, Integer mysqlNum) {
Object redisNum = cache.get(CachePrefix.VIDEO_THUMBS_UP_NUM.getPrefixWithId(videoId));
if (Objects.isNull(redisNum)) {
// redis涓病鏈夊氨鎶婃暟鎹簱鐨勫啓鍒皉edis涓�
--
Gitblit v1.8.0