From 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 29 七月 2025 11:46:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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..8de5366 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();

--
Gitblit v1.8.0