From 4318746ee88ad53e00341df1a0395058bebc40fa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 25 六月 2025 14:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 b56d9ba..ca75179 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
@@ -56,7 +56,7 @@
private final VideoAccountService videoAccountService;
private final KitchenVideoTypeRefService kitchenVideoTypeRefService;
private final VideoGoodsService videoGoodsService;
-
+ private final KitchenTypeService kitchenTypeService;
/**
* 娣诲姞
@@ -197,6 +197,7 @@
VideoGoods e = new VideoGoods();
e.setVideoId(video.getId());
e.setGoodsId(form.getGoodsList().get(i).getGoodsId());
+ e.setGoodsSkuId(form.getGoodsList().get(i).getGoodsSkuId());
e.setGoodsNum(form.getGoodsList().get(i).getGoodsNum());
e.setOrderNum(i);
videoGoods.add(e);
@@ -260,6 +261,7 @@
VideoGoods e = new VideoGoods();
e.setVideoId(video.getId());
e.setGoodsId(form.getGoodsList().get(i).getGoodsId());
+ e.setGoodsSkuId(form.getGoodsList().get(i).getGoodsSkuId());
e.setGoodsNum(form.getGoodsList().get(i).getGoodsNum());
e.setOrderNum(i);
videoGoods.add(e);
@@ -419,6 +421,25 @@
}
@Override
+ public Result kitchenTypeList() {
+ List<KitchenType> list = kitchenTypeService.list(Wrappers.<KitchenType>lambdaQuery().orderByAsc(KitchenType::getSortNum));
+ return Result.ok().data(list);
+ }
+
+ @Override
+ public Result kitchenRecommendVideo(WxKitchenVideoQuery query) {
+ IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
+ baseMapper.wxKitchenVideoQuery(page, query);
+ page.getRecords().forEach(v -> {
+ if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
+ v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
+ v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
+ }
+ });
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public void updateCollectNumBatch(List<CollectTypeNumVO> numList) {
// 鎸�500鏉℃暟鎹繘琛屾媶鍒�
--
Gitblit v1.8.0