From 7cd44d430b742f0594114af2ef9c8dd4f0c316de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=B5=E5=AE=AA=E7=91=9E?= <9198107+min-xianrui@user.noreply.gitee.com> Date: Fri, 14 Feb 2025 14:23:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/modules/item/dto/ItemDTO.java | 16 +++++++++- .../java/io/modules/item/dto/OrderDTO.java | 2 +- .../io/modules/item/entity/OrderEntity.java | 3 -- .../io/modules/item/service/OrderService.java | 8 +++++ .../item/service/impl/OrderServiceImpl.java | 31 ++++++++++++++++++- .../java/io/controller/ItemController.java | 12 +++++++ 6 files changed, 66 insertions(+), 6 deletions(-) diff --git a/admin-ui/common/src/main/java/io/modules/item/dto/ItemDTO.java b/admin-ui/common/src/main/java/io/modules/item/dto/ItemDTO.java index fd150b5..bdc1140 100644 --- a/admin-ui/common/src/main/java/io/modules/item/dto/ItemDTO.java +++ b/admin-ui/common/src/main/java/io/modules/item/dto/ItemDTO.java @@ -1,11 +1,14 @@ package io.modules.item.dto; +import io.modules.item.entity.FrontUserEntity; +import io.modules.item.entity.OrderEntity; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.SchemaProperty; import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -25,7 +28,6 @@ public class ItemDTO implements Serializable { @SchemaProperty(name = "类别编号") private Long categoryId; - private String categoryName; @SchemaProperty(name = "图片") private String image; @@ -64,4 +66,16 @@ public class ItemDTO implements Serializable { private String attribute; + /** + * 分类名称 + */ + private String categoryName; + /** + * 用户信息 + */ + private FrontUserEntity user; + /** + * 评论信息信息 + */ + private List orderEntityList; } diff --git a/admin-ui/common/src/main/java/io/modules/item/dto/OrderDTO.java b/admin-ui/common/src/main/java/io/modules/item/dto/OrderDTO.java index 4bbb38f..b518b4b 100644 --- a/admin-ui/common/src/main/java/io/modules/item/dto/OrderDTO.java +++ b/admin-ui/common/src/main/java/io/modules/item/dto/OrderDTO.java @@ -50,5 +50,5 @@ public class OrderDTO implements Serializable { @SchemaProperty(name = "订单创建时间") private Date createdTime; - + private UserDTO user; } diff --git a/admin-ui/common/src/main/java/io/modules/item/entity/OrderEntity.java b/admin-ui/common/src/main/java/io/modules/item/entity/OrderEntity.java index 8a45c5d..753c389 100644 --- a/admin-ui/common/src/main/java/io/modules/item/entity/OrderEntity.java +++ b/admin-ui/common/src/main/java/io/modules/item/entity/OrderEntity.java @@ -8,9 +8,6 @@ import java.util.Date; /** * 订单表 - * - * @author Mark # - * @since 1.0.0 2025-02-14 */ @Data @TableName("tb_order") diff --git a/admin-ui/common/src/main/java/io/modules/item/service/OrderService.java b/admin-ui/common/src/main/java/io/modules/item/service/OrderService.java index 78e3a37..160b8e5 100644 --- a/admin-ui/common/src/main/java/io/modules/item/service/OrderService.java +++ b/admin-ui/common/src/main/java/io/modules/item/service/OrderService.java @@ -5,6 +5,8 @@ import io.common.service.CrudService; import io.modules.item.dto.OrderDTO; import io.modules.item.entity.OrderEntity; +import java.util.List; + /** * 订单表 * @@ -13,4 +15,10 @@ import io.modules.item.entity.OrderEntity; */ public interface OrderService extends CrudService { + /** + * 获取评论信息 + * @param id + * @return + */ + List getCommintList(Long id); } \ No newline at end of file diff --git a/admin-ui/common/src/main/java/io/modules/item/service/impl/OrderServiceImpl.java b/admin-ui/common/src/main/java/io/modules/item/service/impl/OrderServiceImpl.java index 3357675..dc2bdfa 100644 --- a/admin-ui/common/src/main/java/io/modules/item/service/impl/OrderServiceImpl.java +++ b/admin-ui/common/src/main/java/io/modules/item/service/impl/OrderServiceImpl.java @@ -1,15 +1,24 @@ package io.modules.item.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.hutool.core.util.StrUtil; import io.common.service.impl.CrudServiceImpl; import io.modules.item.dao.OrderDao; import io.modules.item.dto.OrderDTO; +import io.modules.item.dto.UserDTO; import io.modules.item.entity.OrderEntity; import io.modules.item.service.OrderService; +import io.modules.item.service.UserService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 订单表 @@ -17,6 +26,9 @@ import java.util.Map; @Service public class OrderServiceImpl extends CrudServiceImpl implements OrderService { + @Autowired + private UserService userService; + @Override public QueryWrapper getWrapper(Map params){ String id = (String)params.get("id"); @@ -31,5 +43,22 @@ public class OrderServiceImpl extends CrudServiceImpl getCommintList(Long id) { + LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); + lwq.eq(OrderEntity::getOrderStatus,3); + List list = baseDao.selectList(lwq); + List stream = list.stream().map(e -> { + OrderDTO dto = new OrderDTO(); + BeanUtils.copyProperties(e, dto); + if (dto.getUserId() != null) { + UserDTO userDTO = userService.get(e.getUserId()); + if (userDTO!= null) { + dto.setUser(userDTO); + } + } + return dto; + }).collect(Collectors.toList()); + return stream; + } } \ No newline at end of file diff --git a/admin-ui/front/src/main/java/io/controller/ItemController.java b/admin-ui/front/src/main/java/io/controller/ItemController.java index 9459420..bd557a1 100644 --- a/admin-ui/front/src/main/java/io/controller/ItemController.java +++ b/admin-ui/front/src/main/java/io/controller/ItemController.java @@ -12,9 +12,13 @@ import io.common.validator.group.AddGroup; import io.common.validator.group.DefaultGroup; import io.common.validator.group.UpdateGroup; import io.modules.item.dto.ItemDTO; +import io.modules.item.dto.OrderDTO; import io.modules.item.entity.ItemEntity; +import io.modules.item.entity.OrderEntity; import io.modules.item.service.ItemService; +import io.modules.item.service.OrderService; import io.modules.item.service.UserBehaviorService; +import io.modules.item.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -38,6 +42,10 @@ import java.util.stream.Collectors; public class ItemController { @Autowired private ItemService itemService; + @Autowired + private OrderService orderService; + + @Autowired private UserBehaviorService userBehaviorService; @Value("${upload.url}") @@ -56,6 +64,10 @@ public class ItemController { PageData page = itemService.page(params); List list = page.getList().stream().map(e -> { e.setImage(uploadUrl + e.getImage()); + + // 获取评价信息 + List orderEntityList = orderService.getCommintList(e.getId() ); + e.setOrderEntityList(orderEntityList); return e; }).collect(Collectors.toList()); page.setList(list);