From b520c4a12695f91eff47c2da2a368db96cb99c90 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 06 一月 2026 16:21:04 +0800
Subject: [PATCH] 厨师模块
---
framework/src/main/java/cn/lili/modules/lmk/service/KitchenCustomizeService.java | 3 +
framework/src/main/java/cn/lili/modules/lmk/service/impl/AdImgServiceImpl.java | 5 ++
framework/src/main/java/cn/lili/modules/lmk/service/impl/KitchenCustomizeServiceImpl.java | 17 ++++++--
buyer-api/src/main/java/cn/lili/controller/lmk/KitchenController.java | 5 +-
framework/src/main/java/cn/lili/modules/lmk/mapper/KitchenCustomizeMapper.java | 3 +
framework/src/main/java/cn/lili/modules/lmk/service/impl/AdCoverServiceImpl.java | 6 +++
framework/src/main/java/cn/lili/modules/lmk/domain/vo/KitchenGoodsQuery.java | 19 +++++++++
framework/src/main/resources/mapper/lmk/KitchenCustomizeMapper.xml | 34 +++++++++++++++++
8 files changed, 83 insertions(+), 9 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/KitchenController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/KitchenController.java
index 83245c5..ee1a09e 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/KitchenController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/KitchenController.java
@@ -1,6 +1,7 @@
package cn.lili.controller.lmk;
import cn.lili.base.Result;
+import cn.lili.modules.lmk.domain.vo.KitchenGoodsQuery;
import cn.lili.modules.lmk.service.AdCoverService;
import cn.lili.modules.lmk.service.AdImgService;
import cn.lili.modules.lmk.service.KitchenCustomizeService;
@@ -50,8 +51,8 @@
* @return 绉佸帹鍟嗗搧
*/
@GetMapping("/kitchenGoods")
- public Result getKitchenGoods(String id){
- return kitchenCustomizeService.getKitchenGoods(id);
+ public Result getKitchenGoods(KitchenGoodsQuery query){
+ return kitchenCustomizeService.getKitchenGoods(query);
}
/**
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/KitchenGoodsQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/KitchenGoodsQuery.java
new file mode 100644
index 0000000..01f7e3f
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/KitchenGoodsQuery.java
@@ -0,0 +1,19 @@
+package cn.lili.modules.lmk.domain.vo;
+
+
+import cn.lili.base.AbsQuery;
+import lombok.Data;
+
+/**
+ * lmk-shop-java
+ * 绉佸帹鍟嗗搧
+ *
+ * @author : zxl
+ * @date : 2026-01-05 16:10
+ **/
+@Data
+public class KitchenGoodsQuery extends AbsQuery {
+
+ private String tagId;
+ private String comboName;
+}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/KitchenCustomizeMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/KitchenCustomizeMapper.java
index 55293cc..4d2cd8d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/mapper/KitchenCustomizeMapper.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/KitchenCustomizeMapper.java
@@ -1,6 +1,7 @@
package cn.lili.modules.lmk.mapper;
import cn.lili.modules.lmk.domain.entity.KitchenCustomize;
+import cn.lili.modules.lmk.domain.vo.KitchenGoodsQuery;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.lili.modules.lmk.domain.vo.KitchenCustomizeVO;
@@ -31,4 +32,6 @@
*/
IPage getPage(IPage page, @Param("query") KitchenCustomizeQuery query);
+
+ IPage getPageByGoodsQuery(IPage page, @Param("query") KitchenGoodsQuery query);
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/KitchenCustomizeService.java b/framework/src/main/java/cn/lili/modules/lmk/service/KitchenCustomizeService.java
index 0e7ad62..4c24040 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/KitchenCustomizeService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/KitchenCustomizeService.java
@@ -1,6 +1,7 @@
package cn.lili.modules.lmk.service;
import cn.lili.modules.lmk.domain.entity.KitchenCustomize;
+import cn.lili.modules.lmk.domain.vo.KitchenGoodsQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.lili.base.Result;
import cn.lili.modules.lmk.domain.form.KitchenCustomizeForm;
@@ -66,5 +67,5 @@
*/
Result all();
- Result getKitchenGoods(String id);
+ Result getKitchenGoods(KitchenGoodsQuery query);
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/AdCoverServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/AdCoverServiceImpl.java
index 13477cf..b3e092e 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/AdCoverServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/AdCoverServiceImpl.java
@@ -140,6 +140,12 @@
adCovers = new ArrayList<>();
adCovers.add(adImg);
}
+ for(AdCover adCover : adCovers) {
+ if (StringUtils.isNotBlank(adCover.getCoverUrl())&&!adCover.getCoverUrl().contains("http")) {
+ adCover.setCoverUrl(cosUtil.getPreviewUrl(adCover.getCoverUrl()));
+ }
+
+ }
return Result.ok().data(adCovers);
}
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/AdImgServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/AdImgServiceImpl.java
index ebf2e8b..74980ad 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/AdImgServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/AdImgServiceImpl.java
@@ -135,9 +135,12 @@
@Override
public Result getKitchenBanner() {
List<AdImg> adImgs = baseMapper.selectList(null);
- if (adImgs.size()>1) {
+ if (!adImgs.isEmpty()) {
AdImg adImg = adImgs.get(0);
adImgs = new ArrayList<>();
+ if (StringUtils.isNotBlank(adImg.getCoverUrl())&&!adImg.getCoverUrl().contains("http")) {
+ adImg.setCoverUrl(cosUtil.getPreviewUrl(adImg.getCoverUrl()));
+ }
adImgs.add(adImg);
}
return Result.ok().data(adImgs);
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/KitchenCustomizeServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/KitchenCustomizeServiceImpl.java
index a9f7e82..b51fa34 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/KitchenCustomizeServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/KitchenCustomizeServiceImpl.java
@@ -4,6 +4,7 @@
import cn.lili.common.utils.StringUtils;
import cn.lili.modules.lmk.domain.entity.KitchenTag;
import cn.lili.modules.lmk.domain.vo.AdImgVO;
+import cn.lili.modules.lmk.domain.vo.KitchenGoodsQuery;
import cn.lili.modules.lmk.enums.general.StoreCouponStausEnum;
import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -148,11 +149,17 @@
}
@Override
- public Result getKitchenGoods(String id) {
- if (StringUtils.isBlank(id)) {
- return Result.ok().data(new ArrayList<>());
+ public Result getKitchenGoods(KitchenGoodsQuery query) {
+ IPage<KitchenCustomizeVO> page = PageUtil.getPage(query, KitchenCustomizeVO.class);
+ baseMapper.getPageByGoodsQuery(page, query);
+ for (KitchenCustomizeVO record : page.getRecords()) {
+ if (StringUtils.isNotBlank(record.getThumbnail())&&!record.getThumbnail().contains("http")) {
+ record.setThumbnail(cosUtil.getPreviewUrl(record.getThumbnail()));
+ }
+ if (StringUtils.isNotBlank(record.getCoverImg())&&!record.getCoverImg().contains("http")) {
+ record.setCoverImg(cosUtil.getPreviewUrl(record.getCoverImg()));
+ }
}
-// kitchenCustomizeMapper.getKitchenGoods();
- return null;
+ return Result.ok().total(page.getTotal()).data(page.getRecords());
}
}
diff --git a/framework/src/main/resources/mapper/lmk/KitchenCustomizeMapper.xml b/framework/src/main/resources/mapper/lmk/KitchenCustomizeMapper.xml
index c036f62..6c8aef8 100644
--- a/framework/src/main/resources/mapper/lmk/KitchenCustomizeMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/KitchenCustomizeMapper.xml
@@ -78,4 +78,38 @@
order by LKC.create_time desc
</select>
+ <select id="getPageByGoodsQuery" resultMap="BaseResultMap" >
+ SELECT
+ LKC.goods_id,
+ LKC.sku_id,
+ LKC.combo_name,
+ LKC.remark,
+ LKC.num,
+ LKC.cover_img,
+ LKC.orgin_price,
+ LKC.tag_id,
+ LKC.STATUS,
+ LKC.sort,
+ LKC.id,
+ lgs.goods_name,
+ lgs.price,
+ lgs.thumbnail
+ FROM lmk_kitchen_customize LKC
+ JOIN li_goods_sku lgs
+ ON lgs.id = LKC.sku_id AND lgs.delete_flag = 0
+ JOIN li_goods lg
+ ON lg.id = LKC.goods_id
+ AND lg.delete_flag = 0
+ AND lg.market_enable = 'UPPER'
+ WHERE
+ LKC.delete_flag = 0
+ AND LKC.STATUS = 'ENABLE'
+ AND LKC.tag_id = #{query.tagId}
+ <if test="query.comboName !='' and query.comboName != null">
+ AND LKC.combo_name like concat('%',#{query.comboName},'%')
+ </if>
+ ORDER BY lgs.price ASC
+ </select>
+
+
</mapper>
--
Gitblit v1.8.0