From 8e25f623c96b7c53a702263f68fc02c6a2566d1b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 23 六月 2025 14:15:31 +0800
Subject: [PATCH] update 解决管理后台无法查看快递问题 完成大健康小程序接口
---
framework/src/main/resources/mapper/lmk/VideoMapper.xml | 35 +++++++++++++++++
framework/src/main/java/cn/lili/modules/lmk/domain/query/WxKitchenVideoQuery.java | 28 ++++++++++++++
buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java | 15 +++++--
framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java | 4 ++
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 21 ++++++++++
framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java | 3 +
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java | 8 ++++
7 files changed, 109 insertions(+), 5 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
index 9ae68b3..19e4379 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
@@ -5,9 +5,7 @@
import cn.lili.modules.lmk.domain.form.VideoFootPrintForm;
import cn.lili.modules.lmk.domain.form.VideoHomePageInfoForm;
import cn.lili.modules.lmk.domain.form.WxVideoForm;
-import cn.lili.modules.lmk.domain.query.AuthorVideoQuery;
-import cn.lili.modules.lmk.domain.query.HealthVideoQuery;
-import cn.lili.modules.lmk.domain.query.WxHealthVideoQuery;
+import cn.lili.modules.lmk.domain.query.*;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
@@ -16,7 +14,6 @@
import io.swagger.annotations.ApiOperation;
import cn.lili.modules.lmk.service.VideoService;
import cn.lili.base.Result;
-import cn.lili.modules.lmk.domain.query.VideoQuery;
import org.springframework.web.bind.annotation.*;
/**
@@ -80,7 +77,17 @@
public Result healthRecommendVideo(WxHealthVideoQuery query) {
return videoService.healthRecommendVideo(query);
}
+ @GetMapping("/kitchen/type")
+ @ApiOperation(value = "鍘ㄧ瑙嗛绫诲瀷鍒楄〃", notes = "鍘ㄧ瑙嗛绫诲瀷鍒楄〃")
+ public Result kitchenTypeList() {
+ return videoService.kitchenTypeList();
+ }
+ @GetMapping("/kitchen/recommend")
+ @ApiOperation(value = "鍘ㄧ瑙嗛鎺ㄨ崘", notes = "鍘ㄧ瑙嗛鎺ㄨ崘")
+ public Result kitchenRecommendVideo(WxKitchenVideoQuery query) {
+ return videoService.kitchenRecommendVideo(query);
+ }
@GetMapping("/goods/detail/{videoId}")
@ApiOperation(value = "瑙嗛鍟嗗搧鏌ョ湅", notes = "瑙嗛鍟嗗搧鏌ョ湅")
public Result getGoodsDetail(@PathVariable("videoId") String videoId) {
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxKitchenVideoQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxKitchenVideoQuery.java
new file mode 100644
index 0000000..218a45a
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/WxKitchenVideoQuery.java
@@ -0,0 +1,28 @@
+package cn.lili.modules.lmk.domain.query;
+
+import cn.lili.base.AbsQuery;
+import cn.lili.modules.lmk.enums.general.VideoTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 寰俊灏忕▼搴忓ぇ鍋ュ悍鏌ヨ鍙傛暟
+ *
+ * @author wp
+ * @since 2025-05-16
+ */
+@Data
+@ApiModel(value = "寰俊灏忕▼搴忓ぇ鍋ュ悍鏌ヨ鍙傛暟", description = "寰俊灏忕▼搴忓ぇ鍋ュ悍鏌ヨ鍙傛暟")
+public class WxKitchenVideoQuery extends AbsQuery {
+
+ /**
+ * @see VideoTypeEnum
+ */
+ @ApiModelProperty("瑙嗛绫诲瀷锛氳棰戙�佸ぇ鍋ュ悍銆佺鍘紝榛樿涓嶄紶鏌ヨ棰�")
+ private String videoType = VideoTypeEnum.COOK.getValue();
+
+ @ApiModelProperty("鍘ㄧ瑙嗛鏍囩id")
+ private String kitchenTypeId;
+}
+
diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java
index a7396bd..c8a6340 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java
@@ -48,6 +48,9 @@
IPage recommendHealthVideo(IPage page, @Param("query") WxHealthVideoQuery query);
+
+ IPage wxKitchenVideoQuery(IPage page, @Param("query") WxKitchenVideoQuery query);
+
/**
* 鎵归噺鏇存柊瑙嗛鏀惰棌鏁伴噺
*
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java b/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
index 8b8f5c4..f81ad39 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
@@ -126,6 +126,10 @@
Result healthRecommendVideo(WxHealthVideoQuery query);
+ Result kitchenTypeList();
+
+ Result kitchenRecommendVideo(WxKitchenVideoQuery query);
+
/**
* 鎵归噺鏇存柊瑙嗛鏀惰棌鏁伴噺
*
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..0a734f9 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;
/**
* 娣诲姞
@@ -419,6 +419,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鏉℃暟鎹繘琛屾媶鍒�
diff --git a/framework/src/main/resources/mapper/lmk/VideoMapper.xml b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
index 523d764..d4ce727 100644
--- a/framework/src/main/resources/mapper/lmk/VideoMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
@@ -263,6 +263,41 @@
AND LV.video_content_type = 'video'
</select>
+ <select id="wxKitchenVideoQuery" resultMap="WxResultMap">
+ SELECT
+ LV.author_id,
+ LV.cover_url,
+ LV.video_fit,
+ LV.video_duration,
+ LV.video_file_key,
+ LV.title,
+ LV.goods_view_num,
+ LV.goods_order_num,
+ LV.recommend,
+ LV.status,
+ LV.play_num,
+ LV.comment_num,
+ LV.collect_num,
+ LV.weight,
+ LV.audit_pass_time,
+ LV.update_time,
+ LV.video_content_type,
+ LV.video_type,
+ LV.video_imgs,
+ LV.id,
+ LAU.nick_name AS authorName,
+ LAU.avatar AS authorAvatar
+ FROM
+ lmk_video LV
+ LEFT JOIN li_admin_user LAU ON LV.author_id = LAU.id
+ <if test="query.kitchenTypeId !=null and query.kitchenTypeId !=''">
+ JOIN (SELECT DISTINCT video_id FROM lmk_kitchen_video_type_ref WHERE kitchen_type_id = #{query.kitchenTypeId}) VT ON VT.video_id = LV.id
+ </if>
+ WHERE
+ LV.delete_flag = 0 AND LV.status = '1' AND LV.video_type = #{query.videoType}
+ AND LV.video_content_type = 'video'
+ </select>
+
<update id="updateCollectNumBatch">
UPDATE lmk_video
diff --git a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
index db3c267..6f381a0 100644
--- a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
@@ -13,6 +13,7 @@
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
+import cn.lili.modules.order.order.service.OrderPackageService;
import cn.lili.modules.order.order.service.OrderPriceService;
import cn.lili.modules.order.order.service.OrderService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -48,6 +49,9 @@
*/
@Autowired
private OrderPriceService orderPriceService;
+
+ @Autowired
+ private OrderPackageService orderPackageService;
@ApiOperation(value = "鏌ヨ璁㈠崟鍒楄〃鍒嗛〉")
@@ -128,6 +132,10 @@
return ResultUtil.data(orderService.getTraces(orderSn));
}
+ @GetMapping(value = "/getPackage/{orderSn}")
+ public ResultMessage<Object> getPackage(@NotBlank(message = "璁㈠崟缂栧彿涓嶈兘涓虹┖") @PathVariable String orderSn) {
+ return ResultUtil.data(orderPackageService.getOrderPackageVOList(orderSn));
+ }
@ApiOperation(value = "鍗栧璁㈠崟澶囨敞")
@PutMapping("/{orderSn}/sellerRemark")
public ResultMessage<Object> sellerRemark(@PathVariable String orderSn, @RequestParam String sellerRemark) {
--
Gitblit v1.8.0