diff --git a/jpashop/src/main/java/com/example/jpashop/controller/ItemController.java b/jpashop/src/main/java/com/example/jpashop/controller/ItemController.java index 29d70cb4..b23623c4 100644 --- a/jpashop/src/main/java/com/example/jpashop/controller/ItemController.java +++ b/jpashop/src/main/java/com/example/jpashop/controller/ItemController.java @@ -2,8 +2,10 @@ package com.example.jpashop.controller; import com.example.jpashop.domain.item.Book; import com.example.jpashop.domain.item.Item; +import com.example.jpashop.repository.OrderSearch; import com.example.jpashop.service.ItemService; import lombok.RequiredArgsConstructor; +import org.dom4j.rule.Mode; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; diff --git a/jpashop/src/main/java/com/example/jpashop/controller/OrderController.java b/jpashop/src/main/java/com/example/jpashop/controller/OrderController.java index acfd4741..5bf75e45 100644 --- a/jpashop/src/main/java/com/example/jpashop/controller/OrderController.java +++ b/jpashop/src/main/java/com/example/jpashop/controller/OrderController.java @@ -1,7 +1,9 @@ package com.example.jpashop.controller; import com.example.jpashop.domain.Member; +import com.example.jpashop.domain.Order; import com.example.jpashop.domain.item.Item; +import com.example.jpashop.repository.OrderSearch; import com.example.jpashop.service.ItemService; import com.example.jpashop.service.MemberService; import com.example.jpashop.service.OrderService; @@ -9,6 +11,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import java.util.List; @@ -38,4 +42,17 @@ public class OrderController { orderService.order(memberId, itemId, count); return "redirect:/orders"; } + + @GetMapping("/orders") + public String orderList(@ModelAttribute("orderSearch") OrderSearch orderSearch, Model model) { + List orders = orderService.findOrders(orderSearch); + model.addAttribute("orders", orders); + return "order/orderList"; + } + + @PostMapping("/orders/{orderId}/cancel") + public String cancelOrder(@PathVariable("orderId") Long orderId) { + orderService.cancelOrder(orderId); + return "redirect:/orders"; + } } diff --git a/jpashop/src/main/java/com/example/jpashop/service/OrderService.java b/jpashop/src/main/java/com/example/jpashop/service/OrderService.java index e069dc10..7f81564e 100644 --- a/jpashop/src/main/java/com/example/jpashop/service/OrderService.java +++ b/jpashop/src/main/java/com/example/jpashop/service/OrderService.java @@ -8,6 +8,7 @@ import com.example.jpashop.domain.item.Item; import com.example.jpashop.repository.ItemRepository; import com.example.jpashop.repository.MemberRepository; import com.example.jpashop.repository.OrderRepository; +import com.example.jpashop.repository.OrderSearch; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -61,7 +62,7 @@ public class OrderService { } // 검색 -/* public List findOrders(OrderSearch orderSearch) { - return orderRepository.findAll(orderSearch); - }*/ + public List findOrders(OrderSearch orderSearch) { + return orderRepository.findAllByString(orderSearch); + } } diff --git a/jpashop/src/main/resources/templates/order/orderList.html b/jpashop/src/main/resources/templates/order/orderList.html new file mode 100644 index 00000000..dfc334d8 --- /dev/null +++ b/jpashop/src/main/resources/templates/order/orderList.html @@ -0,0 +1,68 @@ + + + + +
+
+
+
+
+
+ +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
#회원명대표상품 이름대표상품 주문가격대표상품 주문수량상태일시
+ CANCEL +
+
+
+
+ + + \ No newline at end of file