diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java index ee6bfbf..bb9e53f 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java @@ -10,7 +10,7 @@ import com.justpickup.orderservice.domain.orderItem.dto.OrderItemDto; import com.justpickup.orderservice.domain.orderItem.entity.OrderItem; import com.justpickup.orderservice.domain.orderItemOption.entity.OrderItemOption; import com.justpickup.orderservice.global.client.store.GetItemResponse; -import com.justpickup.orderservice.global.client.store.GetStoreReseponse; +import com.justpickup.orderservice.global.client.store.GetStoreResponse; import com.justpickup.orderservice.global.client.store.StoreByUserIdResponse; import com.justpickup.orderservice.global.client.store.StoreClient; import com.justpickup.orderservice.global.client.user.UserClient; @@ -186,7 +186,7 @@ public class OrderServiceImpl implements OrderService { public FetchOrderDto fetchOrder(Long userId) { Order order = orderRepositoryCustom.fetchOrderBasket(userId) .orElseThrow(() -> new OrderException("장바구니 정보를 찾을 수 없습니다.")); - GetStoreReseponse store = storeClient.getStore(String.valueOf(order.getStoreId())).getData(); + GetStoreResponse store = storeClient.getStore(String.valueOf(order.getStoreId())).getData(); List data = storeClient.getItemAndItemOptions(order.getOrderItems().stream() .map(OrderItem::getItemId) @@ -209,14 +209,12 @@ public class OrderServiceImpl implements OrderService { ,orderItem)) .collect(Collectors.toList()); - FetchOrderDto fetchOrderDto = FetchOrderDto.builder() + return FetchOrderDto.builder() .userId(order.getUserId()) .orderPrice(order.getOrderPrice()) .storeName(store.getName()) .orderItemDtoList(orderItemDtoList) .build(); - - return fetchOrderDto; } @Override diff --git a/order-service/src/main/java/com/justpickup/orderservice/global/client/store/GetStoreReseponse.java b/order-service/src/main/java/com/justpickup/orderservice/global/client/store/GetStoreReseponse.java deleted file mode 100644 index 3677001..0000000 --- a/order-service/src/main/java/com/justpickup/orderservice/global/client/store/GetStoreReseponse.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.justpickup.orderservice.global.client.store; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class GetStoreReseponse { - private Long id; - private String name; - private String phoneNumber; -} \ No newline at end of file diff --git a/order-service/src/main/java/com/justpickup/orderservice/global/client/store/StoreClient.java b/order-service/src/main/java/com/justpickup/orderservice/global/client/store/StoreClient.java index 33aa5c0..d132873 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/global/client/store/StoreClient.java +++ b/order-service/src/main/java/com/justpickup/orderservice/global/client/store/StoreClient.java @@ -29,18 +29,17 @@ public interface StoreClient { Result> getStoreAllById(@PathVariable("storeId") Iterable storeIds); @GetMapping("/store/{storeId}") - Result getStore(@PathVariable(value = "storeId") String storeId); + Result getStore(@PathVariable(value = "storeId") String storeId); @GetMapping("/api/customer/items/{itemId}") Result> getItemAndItemOptions(@PathVariable(value = "itemId") List itemIds); default Map getStoreNameMap(Set storeIds) { List storeResponses = this.getStoreAllById(storeIds).getData(); - Map storeMap = storeResponses.stream() + return storeResponses.stream() .collect( toMap(GetStoreResponse::getId, GetStoreResponse::getName) ); - return storeMap; } default Map getItemNameMap(Iterable itemIds) {