diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java index a45365ce..3e7e7efa 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java @@ -34,7 +34,7 @@ public class OrderController { private final OrderService orderService; @GetMapping("/{storeId}") - @Operation(summary = "주점별 주문리스트 조회", description = "특정 주점에 대한 예약리스트 조회") + @Operation(summary = "주점별 주문 리스트 조회", description = "특정 주점에 대한 주문 리스트 조회") @ApiResponse(responseCode = "200", description = "주문 리스트 조회") public ResponseEntity getOrderListByStoreId(@PathVariable Long storeId, @AuthenticationPrincipal MemberDetails memberDetails) { diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/dto/OrderResponseDto.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/dto/OrderResponseDto.java index ccca3fd6..d8a3979a 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/dto/OrderResponseDto.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/dto/OrderResponseDto.java @@ -26,13 +26,13 @@ public static OrderResponseDto fromEntity(UserOrder userOrder) { Map menuDetails = new LinkedHashMap<>(); for (OrderItem item : userOrder.getOrderItems()) { - String name = item.getMenu().getName(); + String displayName = item.getMenu().getAdminDisplayName(); int quantity = item.getQuantity(); int price = item.getMenu().getPrice(); // 메뉴 단가 // 메뉴명이 중복되면 수량만 누적 // merge 람다함수 활용(해당 key가 있으면 수량 누적, 없으면 새로 생성) - menuDetails.merge(name, + menuDetails.merge(displayName, new MenuDetail(quantity, price), (oldVal, newVal) -> new MenuDetail( oldVal.getQuantity() + newVal.getQuantity(), diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginResponseDto.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginResponseDto.java index d6c1ebdf..fd99b87e 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginResponseDto.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/user/dto/ManagerLoginResponseDto.java @@ -17,6 +17,8 @@ public class ManagerLoginResponseDto { private String email; @Schema(description = "닉네임", example = "무한이") private String nickname; + @Schema(description = "주점 Id", example = "1") + private Long storeId; @Schema(description = "JWT TOKEN", example = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxNCIsImVtYWlsIjoiYXBpZG9jQGVtYWlsLmNvbSIsInJvbGVzIjpbIk1FTUJFUiJdLCJleHAiOjE3MTIyMjQ5NzV9.SQKtyHmqn2NKzHy4BX7_IgBePO_svEtmz1xbO9ToMz8") private String accessToken; @@ -25,6 +27,7 @@ public static ManagerLoginResponseDto fromEntity(User user,String token) { .userId(user.getId()) .email(user.getEmail()) .nickname(user.getNickname()) + .storeId(user.getStoreId()) .accessToken(token) .build(); }