From c13e4a322e3d58183882478703fe919a88759cb4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 15 六月 2025 19:27:58 +0800
Subject: [PATCH] 视频发布支持多个商品
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 15 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 a15a912..4a4448c 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
@@ -6,15 +6,14 @@
import cn.lili.modules.lmk.domain.query.AuthorVideoQuery;
import cn.lili.modules.lmk.domain.query.ManagerVideoQuery;
import cn.lili.modules.lmk.domain.vo.*;
-import cn.lili.modules.lmk.enums.general.TagCreateTypeEnum;
-import cn.lili.modules.lmk.enums.general.VideoStatusEnum;
-import cn.lili.modules.lmk.enums.general.ViewTypeEnum;
+import cn.lili.modules.lmk.enums.general.*;
import cn.lili.modules.lmk.service.*;
import cn.lili.modules.member.entity.dos.FootPrint;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.service.FootprintService;
import cn.lili.modules.member.service.MemberService;
import cn.lili.utils.COSUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import cn.lili.modules.lmk.mapper.VideoMapper;
import cn.lili.base.Result;
@@ -56,6 +55,8 @@
private final MySubscribeService mySubscribeService;
private final MemberService memberService;
private final VideoAccountService videoAccountService;
+ private final VideoGoodsService videoGoodsService;
+
/**
* 娣诲姞
@@ -63,8 +64,8 @@
* @return
*/
@Override
- public Result add(VideoForm form) {
- Video entity = VideoForm.getEntityByForm(form, null);
+ public Result add(WxVideoForm form) {
+ Video entity = WxVideoForm.getEntityByForm(form, null);
baseMapper.insert(entity);
return Result.ok("娣诲姞鎴愬姛");
}
@@ -75,7 +76,7 @@
* @return
*/
@Override
- public Result update(VideoForm form) {
+ public Result update(WxVideoForm form) {
Video entity = baseMapper.selectById(form.getId());
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
@@ -130,7 +131,11 @@
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
List<SimpleVideoTagVO> tags = videoTagRefService.getTagsByVideoIds(Arrays.asList(id));
vo.setTagList(tags);
- vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
+ if (VideoContentTypeEnum.VIDEO.getValue().equals(vo.getVideoContentType())) {
+ vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
+ } else if (VideoContentTypeEnum.IMG.getValue().equals(vo.getVideoContentType()) && StringUtils.isNotBlank(vo.getVideoImgs())) {
+ vo.setImgs(JSON.parseArray(vo.getVideoImgs(), String.class).stream().map(fileKey -> cosUtil.getPreviewUrl(fileKey)).collect(Collectors.toList()));
+ }
return Result.ok().data(vo);
}
@@ -149,12 +154,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Result publish(VideoForm form) {
+ public Result publish(WxVideoForm form) {
// 1.淇濆瓨瑙嗛
- Video video = VideoForm.getEntityByForm(form, null);
+ Video video = WxVideoForm.getEntityByForm(form, null);
video.setAuthorId(UserContext.getCurrentUserId());
video.setStatus(VideoStatusEnum.AUDITING.getValue());
video.setCoverUrl(form.getCover());
+ video.setVideoType(VideoTypeEnum.VIDEO.getValue());
+ if (VideoContentTypeEnum.IMG.getValue().equals(form.getVideoContentType())) {
+ video.setVideoImgs(JSON.toJSONString(form.getVideoImgs()));
+ }
baseMapper.insert(video);
// 2.澶勭悊鏍囩
List<VideoTagRef> videoTagRefs = form.getTags().stream().map(tag -> {
@@ -179,8 +188,21 @@
return videoTagRef;
}).collect(Collectors.toList());
videoTagRefService.saveBatch(videoTagRefs);
- // 3.淇濆瓨瑙嗛鏂囦欢淇℃伅
+ // 3. 淇濆瓨瑙嗛鏂囦欢淇℃伅
lmkFileService.addByForm(form.getFileInfo());
+ // 4. 澶勭悊閫夋嫨鐨勫晢鍝�
+ if (CollectionUtils.isNotEmpty(form.getGoodsList())) {
+ List<VideoGoods> videoGoods = new ArrayList<>(2);
+ for (int i = 0; i < form.getGoodsList().size(); i++) {
+ VideoGoods e = new VideoGoods();
+ e.setVideoId(video.getId());
+ e.setGoodsId(form.getGoodsList().get(i).getGoodsId());
+ e.setGoodsNum(form.getGoodsList().get(i).getGoodsNum());
+ e.setOrderNum(i);
+ videoGoods.add(e);
+ }
+ videoGoodsService.saveBatch(videoGoods);
+ }
return Result.ok("鍙戝竷鎴愬姛锛岃棰戝鏍镐腑~");
}
@@ -266,7 +288,7 @@
IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
switch (query.getVideoFrom()) {
case "recommend":
- baseMapper.recommendVideo(page);
+ baseMapper.recommendVideo(page, query);
break;
case "author":
AuthorVideoQuery query1 = new AuthorVideoQuery();
@@ -276,7 +298,7 @@
case "collect":
AuthorVideoQuery query2 = new AuthorVideoQuery();
query2.setAuthorId(query.getAuthorId());
- baseMapper.getAuthorVideoPage(page, query2);
+ baseMapper.getAuthorCollectVideoPage(page, query2);
break;
default:
break;
@@ -295,7 +317,12 @@
v.setGoods(new VideoGoodsVO());
v.setTagList(tagMap.get(v.getId()));
v.setCollected(CollectionUtils.isNotEmpty(collectMap.get(v.getId())));
- v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
+ if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
+ // v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
+ v.setVideoUrl("https://videos.pexels.com/video-files/13602965/13602965-hd_1920_1080_30fps.mp4");
+ } else if (VideoContentTypeEnum.IMG.getValue().equals(v.getVideoContentType()) && StringUtils.isNotBlank(v.getVideoImgs())) {
+ v.setImgs(JSON.parseArray(v.getVideoImgs(), String.class).stream().map(fileKey -> cosUtil.getPreviewUrl(fileKey)).collect(Collectors.toList()));
+ }
v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
v.setSubscribeThisAuthor(subscribes.contains(v.getAuthorId()));
});
@@ -352,10 +379,13 @@
@Override
public Result getAuthorVideoPage(AuthorVideoQuery query) {
IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
+ query.setAuthorSelf(UserContext.getCurrentUserId().equals(query.getAuthorId()));
baseMapper.getAuthorVideoPage(page, query);
for (WxVideoVO vo : page.getRecords()) {
vo.setCoverUrl(cosUtil.getPreviewUrl(vo.getCoverFileKey()));
- vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoUrl()));
+// vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
+ vo.setVideoUrl("https://videos.pexels.com/video-files/13602965/13602965-hd_1920_1080_30fps.mp4");
+ vo.setOptions(VideoSupportOpEnum.getVideoOpByStatus(vo.getStatus()));
}
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -366,7 +396,8 @@
baseMapper.getAuthorCollectVideoPage(page, query);
for (WxVideoVO vo : page.getRecords()) {
vo.setCoverUrl(cosUtil.getPreviewUrl(vo.getCoverFileKey()));
- vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoUrl()));
+// vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
+ vo.setVideoUrl("https://videos.pexels.com/video-files/13602965/13602965-hd_1920_1080_30fps.mp4");
vo.setCollected(Boolean.TRUE);
}
return Result.ok().data(page.getRecords()).total(page.getTotal());
@@ -386,4 +417,26 @@
.update();
return Result.ok("淇濆瓨鎴愬姛");
}
+
+ @Override
+ public Result wxDetail(String id) {
+ WxEditVideoVO vo = baseMapper.wxDetail(id);
+ if (Objects.isNull(vo)) {
+ return Result.error("瑙嗛涓嶅瓨鍦�");
+ }
+ vo.setCoverUrl(cosUtil.getPreviewUrl(vo.getCoverFileKey()));
+// vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
+ vo.setVideoUrl("https://videos.pexels.com/video-files/13602965/13602965-hd_1920_1080_30fps.mp4");
+ List<WxVideoTagForm> tags = videoTagRefService.getTagsByVideoIds(Arrays.asList(vo.getId()))
+ .stream()
+ .map(i -> {
+ WxVideoTagForm tag = new WxVideoTagForm();
+ tag.setTagName(i.getTagName());
+ tag.setId(i.getId());
+ return tag;
+ })
+ .collect(Collectors.toList());
+ vo.setTags(tags);
+ return Result.ok().data(vo);
+ }
}
--
Gitblit v1.8.0