From 2f73879357acc288f1026ffc5a094be6b810131f Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 8 Aug 2025 14:28:21 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor(User):=20storeId=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationadmin/user/dto/ManagerLoginResponseDto.java | 3 +++ 1 file changed, 3 insertions(+) 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(); } From a07cbeb1a39c85328f94a846444a489d15b39587 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 8 Aug 2025 14:39:52 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor(Swagger):=20api=20=EC=84=A4?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationadmin/order/controller/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { From 381a1dae2fe6051757ccfaf9af749d9c93fa24f0 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Fri, 8 Aug 2025 14:40:17 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor(Oder):=20=EC=A3=BC=EB=AC=B8=20?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=EC=9A=A9=20=EC=9D=B4=EB=A6=84=20=EB=85=B8?= =?UTF-8?q?=EC=B6=9C=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nowait/applicationadmin/order/dto/OrderResponseDto.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(),