From 5df68400a8782eeff543c51102e57eddbef7bc45 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 5 Jun 2025 16:20:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=8F=9C=E8=B0=B1=E8=AF=84?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/cook/domain/CookEvaluaDetail.java | 6 ++ .../core/cook/domain/CookEvaluaOrder.java | 3 + .../core/cook/dto/CookEvaluaOrderDTO.java | 3 + .../impl/CookEvaluaDetailServiceImpl.java | 16 +++++- .../impl/CookEvaluaOrderServiceImpl.java | 3 + .../core/cook/vo/CookEvaluaDetailVO.java | 57 +++++++++++++++++++ .../core/cook/vo/CookEvaluaOrderVo.java | 5 ++ .../mapper/cook/CookEvaluaDetailMapper.xml | 20 ++++--- .../mapper/cook/CookEvaluaOrderMapper.xml | 9 ++- 9 files changed, 112 insertions(+), 10 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookEvaluaDetailVO.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaDetail.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaDetail.java index 4a5f5e9..97749d0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaDetail.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaDetail.java @@ -6,6 +6,8 @@ import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import java.util.List; + /** * 订单评价菜品对象 cook_evalua_detail * @@ -47,5 +49,9 @@ public class CookEvaluaDetail extends BaseEntity { @ApiModelProperty(value = "描述") private String description; + @ApiModelProperty("评价者昵称") + private String evaluaNickName; + @ApiModelProperty("评价图片") + private List pictureList; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java index 15543b2..964f2a6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookEvaluaOrder.java @@ -26,6 +26,9 @@ public class CookEvaluaOrder extends BaseEntity { /** 菜品评价id */ private Long evaluaId; + /** 评价者id */ + private Long userId; + /** 订单编号 */ @Excel(name = "订单编号") @ApiModelProperty(value = "订单编号") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookEvaluaOrderDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookEvaluaOrderDTO.java index 209a4fd..73a69d8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookEvaluaOrderDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookEvaluaOrderDTO.java @@ -27,6 +27,9 @@ public class CookEvaluaOrderDTO extends BaseEntity { /** 菜品评价id */ private Long evaluaId; + /** 评价者id */ + private Long userId; + /** 订单编号 */ @Excel(name = "订单编号") @ApiModelProperty(value = "订单编号") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaDetailServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaDetailServiceImpl.java index 7545a69..6ffba8f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaDetailServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaDetailServiceImpl.java @@ -1,6 +1,10 @@ package com.bonus.canteen.core.cook.service.impl; import java.util.List; +import java.util.stream.Collectors; + +import com.bonus.canteen.core.cook.domain.CookEvaluaPicture; +import com.bonus.canteen.core.cook.mapper.CookEvaluaPictureMapper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +23,8 @@ import com.bonus.canteen.core.cook.service.ICookEvaluaDetailService; public class CookEvaluaDetailServiceImpl implements ICookEvaluaDetailService { @Autowired private CookEvaluaDetailMapper cookEvaluaDetailMapper; + @Autowired + private CookEvaluaPictureMapper cookEvaluaPictureMapper; /** * 查询订单评价菜品 @@ -39,7 +45,15 @@ public class CookEvaluaDetailServiceImpl implements ICookEvaluaDetailService { */ @Override public List selectCookEvaluaDetailList(CookEvaluaDetail cookEvaluaDetail) { - return cookEvaluaDetailMapper.selectCookEvaluaDetailList(cookEvaluaDetail); + List list = cookEvaluaDetailMapper.selectCookEvaluaDetailList(cookEvaluaDetail); + for (CookEvaluaDetail detail : list) { + CookEvaluaPicture menuEvaluaPicture = new CookEvaluaPicture(); + menuEvaluaPicture.setEvaluaId(detail.getEvaluaId()); + List menuEvaluaPictures = cookEvaluaPictureMapper.selectCookEvaluaPictureList(menuEvaluaPicture); + List pictures = menuEvaluaPictures.stream().map(CookEvaluaPicture::getImgUrl).collect(Collectors.toList()); + detail.setPictureList(pictures); + } + return list; } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaOrderServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaOrderServiceImpl.java index ad3490c..f7a14ef 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaOrderServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookEvaluaOrderServiceImpl.java @@ -96,6 +96,9 @@ public class CookEvaluaOrderServiceImpl implements ICookEvaluaOrderService { } cookEvaluaOrderDTO.setCreateTime(DateUtils.getNowDate()); cookEvaluaOrderDTO.setCreateBy(SecurityUtils.getUsername()); + if (Objects.isNull(cookEvaluaOrderDTO.getUserId())) { + cookEvaluaOrderDTO.setUserId(SecurityUtils.getUserId()); + } try { int count = cookEvaluaOrderMapper.insertCookEvaluaOrder(cookEvaluaOrderDTO); long evaluaId = cookEvaluaOrderDTO.getEvaluaId(); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookEvaluaDetailVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookEvaluaDetailVO.java new file mode 100644 index 0000000..c1a45c9 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookEvaluaDetailVO.java @@ -0,0 +1,57 @@ +package com.bonus.canteen.core.cook.vo; + +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.util.List; + +/** + * 订单评价菜品对象 cook_evalua_detail + * + * @author xsheng + * @date 2025-05-25 + */ + + +@Data +@ToString +public class CookEvaluaDetailVO extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 详情id */ + private Long evaluaDetailId; + + /** 评价id */ + @Excel(name = "评价id") + @ApiModelProperty(value = "评价id") + private Long evaluaId; + + /** 餐品类型(1-菜品,2-套餐,3-商品) */ + @Excel(name = "餐品类型(1-菜品,2-套餐,3-商品)") + @ApiModelProperty(value = "餐品类型(1-菜品,2-套餐,3-商品)") + private Long mealType; + + /** 餐品id */ + @Excel(name = "餐品id") + @ApiModelProperty(value = "餐品id") + private Long mealId; + + /** 星级 */ + @Excel(name = "星级") + @ApiModelProperty(value = "星级") + private Long starLevel; + + /** 描述 */ + @Excel(name = "描述") + @ApiModelProperty(value = "描述") + private String description; + + @ApiModelProperty("评价者昵称") + private String evaluaNickName; + + @ApiModelProperty("评价图片") + private List pictureList; +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookEvaluaOrderVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookEvaluaOrderVo.java index c638d9d..c9861b3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookEvaluaOrderVo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookEvaluaOrderVo.java @@ -28,6 +28,11 @@ public class CookEvaluaOrderVo extends BaseEntity { @ApiModelProperty(value = "评价id") private Long evaluaId; + /** 用户id */ + @Excel(name = "用户id") + @ApiModelProperty(value = "用户id") + private Long userId; + /** 订单编号 */ @Excel(name = "订单编号") @ApiModelProperty(value = "订单编号") diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaDetailMapper.xml index cdc83d1..1c8bda7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaDetailMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,23 +18,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select evalua_detail_id, evalua_id, meal_type, meal_id, star_level, description, create_by, create_time, update_by, update_time from cook_evalua_detail + select ced.evalua_detail_id, ced.evalua_id, ced.meal_type, ced.meal_id, ced.star_level, + ced.description, ced.create_by, ced.create_time, ced.update_by, ced.update_time, + su.nick_name + from cook_evalua_detail ced + left join cook_evalua_order ceo on ceo.evalua_id = ced.evalua_id + left join sys_user su on su.user_id = ceo.user_id diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml index 9d17056..439684b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookEvaluaOrderMapper.xml @@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -20,14 +21,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select evalua_id, order_id, star_level, description, reply, reply_time, stall_id, + select evalua_id, user_id, order_id, star_level, description, reply, reply_time, stall_id, show_flag, order_evalua_type, create_by, create_time, update_by, update_time from cook_evalua_order