From c64fd7a60a925dd32c5e3838a7a8a4cf571edf17 Mon Sep 17 00:00:00 2001 From: jeonghyemin Date: Thu, 17 Jul 2025 16:02:57 +0900 Subject: [PATCH] =?UTF-8?q?feat(Order):=20order=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=8B=9C=20=EC=A3=BC=EB=AC=B8=EC=83=81=ED=83=9C=20=EB=B0=98?= =?UTF-8?q?=ED=99=98=EA=B0=92=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/dto/OrderItemListGetResponseDto.java | 5 ++++- .../nowait/applicationuser/order/service/OrderService.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/dto/OrderItemListGetResponseDto.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/dto/OrderItemListGetResponseDto.java index 3df52b94..2238e09a 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/dto/OrderItemListGetResponseDto.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/dto/OrderItemListGetResponseDto.java @@ -2,6 +2,7 @@ import com.nowait.domaincorerdb.order.entity.OrderItem; +import com.nowait.domaincorerdb.order.entity.OrderStatus; import lombok.AllArgsConstructor; import lombok.Builder; @@ -17,13 +18,15 @@ public class OrderItemListGetResponseDto { private String menuName; private Integer quantity; private Integer price; + private OrderStatus status; - public static OrderItemListGetResponseDto fromEntity(OrderItem orderItem) { + public static OrderItemListGetResponseDto fromEntity(OrderItem orderItem,OrderStatus status) { return OrderItemListGetResponseDto.builder() .orderId(orderItem.getUserOrder().getId()) .menuName(orderItem.getMenu().getName()) .quantity(orderItem.getQuantity()) .price(orderItem.getMenu().getPrice()) + .status(status) .build(); } diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/service/OrderService.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/service/OrderService.java index 1f0ed53c..3c76e5ba 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/service/OrderService.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/order/service/OrderService.java @@ -99,8 +99,8 @@ public List getOrderItems(Long storeId, Long tableI // 2. OrderItem으로 변환 return userOrders.stream() - .flatMap(order -> order.getOrderItems().stream()) - .map(OrderItemListGetResponseDto::fromEntity) + .flatMap(order -> order.getOrderItems().stream() + .map(orderItem -> OrderItemListGetResponseDto.fromEntity(orderItem, order.getStatus()))) .toList(); }