diff --git a/VamPa/src/main/java/com/vam/controller/OrderController.java b/VamPa/src/main/java/com/vam/controller/OrderController.java index b0d0fe1..f105235 100644 --- a/VamPa/src/main/java/com/vam/controller/OrderController.java +++ b/VamPa/src/main/java/com/vam/controller/OrderController.java @@ -1,21 +1,32 @@ package com.vam.controller; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import com.vam.model.OrderPageDTO; +import com.vam.service.MemberService; +import com.vam.service.OrderService; @Controller public class OrderController { + + @Autowired + private OrderService orderService; + + @Autowired + private MemberService memberService; @GetMapping("/order/{memberId}") - public void orderPgaeGET(@PathVariable("memberId") String memberId, OrderPageDTO opd, Model model) { + public String orderPgaeGET(@PathVariable("memberId") String memberId, OrderPageDTO opd, Model model) { - System.out.println("memberId : " + memberId); - System.out.println("orders : " + opd.getOrders()); + model.addAttribute("orderList", orderService.getGoodsInfo(opd.getOrders())); + model.addAttribute("memberInfo", memberService.getMemberInfo(memberId)); + + return "/order"; } } diff --git a/VamPa/src/main/java/com/vam/mapper/MemberMapper.java b/VamPa/src/main/java/com/vam/mapper/MemberMapper.java index e360cf4..5d5e5eb 100644 --- a/VamPa/src/main/java/com/vam/mapper/MemberMapper.java +++ b/VamPa/src/main/java/com/vam/mapper/MemberMapper.java @@ -13,4 +13,7 @@ public interface MemberMapper { /* 로그인 */ public MemberVO memberLogin(MemberVO member); + /* 주문자 주소 정보 */ + public MemberVO getMemberInfo(String memberId); + } diff --git a/VamPa/src/main/java/com/vam/mapper/OrderMapper.java b/VamPa/src/main/java/com/vam/mapper/OrderMapper.java new file mode 100644 index 0000000..5a83951 --- /dev/null +++ b/VamPa/src/main/java/com/vam/mapper/OrderMapper.java @@ -0,0 +1,10 @@ +package com.vam.mapper; + +import com.vam.model.OrderPageItemDTO; + +public interface OrderMapper { + + /* 주문 상품 정보 */ + public OrderPageItemDTO getGoodsInfo(int bookId); + +} diff --git a/VamPa/src/main/java/com/vam/service/MemberService.java b/VamPa/src/main/java/com/vam/service/MemberService.java index 250e491..6839f5b 100644 --- a/VamPa/src/main/java/com/vam/service/MemberService.java +++ b/VamPa/src/main/java/com/vam/service/MemberService.java @@ -12,5 +12,8 @@ public interface MemberService { /* 로그인 */ public MemberVO memberLogin(MemberVO member) throws Exception; - + + /* 주문자 정보 */ + public MemberVO getMemberInfo(String memberId); + } diff --git a/VamPa/src/main/java/com/vam/service/MemberServiceImpl.java b/VamPa/src/main/java/com/vam/service/MemberServiceImpl.java index edd7122..3393365 100644 --- a/VamPa/src/main/java/com/vam/service/MemberServiceImpl.java +++ b/VamPa/src/main/java/com/vam/service/MemberServiceImpl.java @@ -34,6 +34,14 @@ public class MemberServiceImpl implements MemberService{ return membermapper.memberLogin(member); } + /* 주문자 정보 */ + @Override + public MemberVO getMemberInfo(String memberId) { + + return membermapper.getMemberInfo(memberId); + + } + } diff --git a/VamPa/src/main/java/com/vam/service/OrderService.java b/VamPa/src/main/java/com/vam/service/OrderService.java new file mode 100644 index 0000000..5445faa --- /dev/null +++ b/VamPa/src/main/java/com/vam/service/OrderService.java @@ -0,0 +1,12 @@ +package com.vam.service; + +import java.util.List; + +import com.vam.model.OrderPageItemDTO; + +public interface OrderService { + + /* 주문 정보 */ + public List getGoodsInfo(List orders); + +} diff --git a/VamPa/src/main/java/com/vam/service/OrderServiceImpl.java b/VamPa/src/main/java/com/vam/service/OrderServiceImpl.java new file mode 100644 index 0000000..84626e4 --- /dev/null +++ b/VamPa/src/main/java/com/vam/service/OrderServiceImpl.java @@ -0,0 +1,40 @@ +package com.vam.service; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.vam.mapper.OrderMapper; +import com.vam.model.OrderPageItemDTO; + +@Service +public class OrderServiceImpl implements OrderService{ + + @Autowired + private OrderMapper orderMapper; + + @Override + public List getGoodsInfo(List orders) { + + List result = new ArrayList(); + + for(OrderPageItemDTO ord : orders) { + + OrderPageItemDTO goodsInfo = orderMapper.getGoodsInfo(ord.getBookId()); + + goodsInfo.setBookCount(ord.getBookCount()); + + goodsInfo.initSaleTotal(); + + result.add(goodsInfo); + } + + return result; + + } + + + +} diff --git a/VamPa/src/main/resources/com/vam/mapper/MemberMapper.xml b/VamPa/src/main/resources/com/vam/mapper/MemberMapper.xml index 2aabe8a..06bd62b 100644 --- a/VamPa/src/main/resources/com/vam/mapper/MemberMapper.xml +++ b/VamPa/src/main/resources/com/vam/mapper/MemberMapper.xml @@ -27,5 +27,14 @@ + + + \ No newline at end of file diff --git a/VamPa/src/main/resources/com/vam/mapper/OrderMapper.xml b/VamPa/src/main/resources/com/vam/mapper/OrderMapper.xml new file mode 100644 index 0000000..34558c1 --- /dev/null +++ b/VamPa/src/main/resources/com/vam/mapper/OrderMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/VamPa/src/main/webapp/WEB-INF/views/order.jsp b/VamPa/src/main/webapp/WEB-INF/views/order.jsp new file mode 100644 index 0000000..e859607 --- /dev/null +++ b/VamPa/src/main/webapp/WEB-INF/views/order.jsp @@ -0,0 +1,17 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + +Insert title here + + +
+ ${orderList} +
+
+ ${memberInfo} +
+ + \ No newline at end of file diff --git a/VamPa/target/classes/com/vam/mapper/MemberMapper.xml b/VamPa/target/classes/com/vam/mapper/MemberMapper.xml index 2aabe8a..06bd62b 100644 --- a/VamPa/target/classes/com/vam/mapper/MemberMapper.xml +++ b/VamPa/target/classes/com/vam/mapper/MemberMapper.xml @@ -27,5 +27,14 @@ + + + \ No newline at end of file diff --git a/VamPa/target/classes/com/vam/mapper/OrderMapper.xml b/VamPa/target/classes/com/vam/mapper/OrderMapper.xml new file mode 100644 index 0000000..34558c1 --- /dev/null +++ b/VamPa/target/classes/com/vam/mapper/OrderMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/VamPa/target/m2e-wtp/web-resources/META-INF/maven/com.vam/controller/pom.properties b/VamPa/target/m2e-wtp/web-resources/META-INF/maven/com.vam/controller/pom.properties index f317b81..15b9164 100644 --- a/VamPa/target/m2e-wtp/web-resources/META-INF/maven/com.vam/controller/pom.properties +++ b/VamPa/target/m2e-wtp/web-resources/META-INF/maven/com.vam/controller/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven Integration for Eclipse -#Wed Dec 08 02:51:47 KST 2021 +#Thu Dec 09 15:29:52 KST 2021 m2e.projectLocation=C\:\\Users\\sjinj\\git\\Blog_Project2\\VamPa m2e.projectName=VamPa groupId=com.vam diff --git a/VamPa_MySQL/src/main/java/com/vam/controller/OrderController.java b/VamPa_MySQL/src/main/java/com/vam/controller/OrderController.java index 6d0c0a8..4f3dc34 100644 --- a/VamPa_MySQL/src/main/java/com/vam/controller/OrderController.java +++ b/VamPa_MySQL/src/main/java/com/vam/controller/OrderController.java @@ -1,21 +1,32 @@ package com.vam.controller; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import com.vam.model.OrderPageDTO; +import com.vam.service.MemberService; +import com.vam.service.OrderService; @Controller public class OrderController { + + @Autowired + private OrderService orderService; + + @Autowired + private MemberService memberService; @GetMapping("/order/{memberId}") - public void orderPgaeGET(@PathVariable("memberId") String memberId, OrderPageDTO opd, Model model) { + public String orderPgaeGET(@PathVariable("memberId") String memberId, OrderPageDTO opd, Model model) { - System.out.println("memberId : " + memberId); - System.out.println("orders : " + opd.getOrders()); + model.addAttribute("orderList", orderService.getGoodsInfo(opd.getOrders())); + model.addAttribute("memberInfo", memberService.getMemberInfo(memberId)); - } + + return "/order"; + } } diff --git a/VamPa_MySQL/src/main/java/com/vam/mapper/MemberMapper.java b/VamPa_MySQL/src/main/java/com/vam/mapper/MemberMapper.java index e360cf4..5d5e5eb 100644 --- a/VamPa_MySQL/src/main/java/com/vam/mapper/MemberMapper.java +++ b/VamPa_MySQL/src/main/java/com/vam/mapper/MemberMapper.java @@ -13,4 +13,7 @@ public interface MemberMapper { /* 로그인 */ public MemberVO memberLogin(MemberVO member); + /* 주문자 주소 정보 */ + public MemberVO getMemberInfo(String memberId); + } diff --git a/VamPa_MySQL/src/main/java/com/vam/mapper/OrderMapper.java b/VamPa_MySQL/src/main/java/com/vam/mapper/OrderMapper.java new file mode 100644 index 0000000..5a83951 --- /dev/null +++ b/VamPa_MySQL/src/main/java/com/vam/mapper/OrderMapper.java @@ -0,0 +1,10 @@ +package com.vam.mapper; + +import com.vam.model.OrderPageItemDTO; + +public interface OrderMapper { + + /* 주문 상품 정보 */ + public OrderPageItemDTO getGoodsInfo(int bookId); + +} diff --git a/VamPa_MySQL/src/main/java/com/vam/service/MemberService.java b/VamPa_MySQL/src/main/java/com/vam/service/MemberService.java index c01a0ef..ff24b2e 100644 --- a/VamPa_MySQL/src/main/java/com/vam/service/MemberService.java +++ b/VamPa_MySQL/src/main/java/com/vam/service/MemberService.java @@ -13,4 +13,7 @@ public interface MemberService { /* 로그인 */ public MemberVO memberLogin(MemberVO member) throws Exception; + /* 주문자 정보 */ + public MemberVO getMemberInfo(String memberId); + } diff --git a/VamPa_MySQL/src/main/java/com/vam/service/MemberServiceImpl.java b/VamPa_MySQL/src/main/java/com/vam/service/MemberServiceImpl.java index 674c793..b86daa9 100644 --- a/VamPa_MySQL/src/main/java/com/vam/service/MemberServiceImpl.java +++ b/VamPa_MySQL/src/main/java/com/vam/service/MemberServiceImpl.java @@ -33,5 +33,13 @@ public class MemberServiceImpl implements MemberService { return membermapper.memberLogin(member); } + + /* 주문자 정보 */ + @Override + public MemberVO getMemberInfo(String memberId) { + + return membermapper.getMemberInfo(memberId); + + } } diff --git a/VamPa_MySQL/src/main/java/com/vam/service/OrderService.java b/VamPa_MySQL/src/main/java/com/vam/service/OrderService.java new file mode 100644 index 0000000..5445faa --- /dev/null +++ b/VamPa_MySQL/src/main/java/com/vam/service/OrderService.java @@ -0,0 +1,12 @@ +package com.vam.service; + +import java.util.List; + +import com.vam.model.OrderPageItemDTO; + +public interface OrderService { + + /* 주문 정보 */ + public List getGoodsInfo(List orders); + +} diff --git a/VamPa_MySQL/src/main/java/com/vam/service/OrderServiceImpl.java b/VamPa_MySQL/src/main/java/com/vam/service/OrderServiceImpl.java new file mode 100644 index 0000000..84626e4 --- /dev/null +++ b/VamPa_MySQL/src/main/java/com/vam/service/OrderServiceImpl.java @@ -0,0 +1,40 @@ +package com.vam.service; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.vam.mapper.OrderMapper; +import com.vam.model.OrderPageItemDTO; + +@Service +public class OrderServiceImpl implements OrderService{ + + @Autowired + private OrderMapper orderMapper; + + @Override + public List getGoodsInfo(List orders) { + + List result = new ArrayList(); + + for(OrderPageItemDTO ord : orders) { + + OrderPageItemDTO goodsInfo = orderMapper.getGoodsInfo(ord.getBookId()); + + goodsInfo.setBookCount(ord.getBookCount()); + + goodsInfo.initSaleTotal(); + + result.add(goodsInfo); + } + + return result; + + } + + + +} diff --git a/VamPa_MySQL/src/main/resources/com/vam/mapper/MemberMapper.xml b/VamPa_MySQL/src/main/resources/com/vam/mapper/MemberMapper.xml index 92a18df..b75cd61 100644 --- a/VamPa_MySQL/src/main/resources/com/vam/mapper/MemberMapper.xml +++ b/VamPa_MySQL/src/main/resources/com/vam/mapper/MemberMapper.xml @@ -27,4 +27,13 @@ + + + \ No newline at end of file diff --git a/VamPa_MySQL/src/main/resources/com/vam/mapper/OrderMapper.xml b/VamPa_MySQL/src/main/resources/com/vam/mapper/OrderMapper.xml new file mode 100644 index 0000000..34558c1 --- /dev/null +++ b/VamPa_MySQL/src/main/resources/com/vam/mapper/OrderMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/VamPa_MySQL/src/main/webapp/WEB-INF/views/order.jsp b/VamPa_MySQL/src/main/webapp/WEB-INF/views/order.jsp new file mode 100644 index 0000000..e859607 --- /dev/null +++ b/VamPa_MySQL/src/main/webapp/WEB-INF/views/order.jsp @@ -0,0 +1,17 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + + +Insert title here + + +
+ ${orderList} +
+
+ ${memberInfo} +
+ + \ No newline at end of file diff --git a/VamPa_MySQL/target/classes/com/vam/mapper/MemberMapper.xml b/VamPa_MySQL/target/classes/com/vam/mapper/MemberMapper.xml index 92a18df..b75cd61 100644 --- a/VamPa_MySQL/target/classes/com/vam/mapper/MemberMapper.xml +++ b/VamPa_MySQL/target/classes/com/vam/mapper/MemberMapper.xml @@ -27,4 +27,13 @@ + + + \ No newline at end of file diff --git a/VamPa_MySQL/target/classes/com/vam/mapper/OrderMapper.xml b/VamPa_MySQL/target/classes/com/vam/mapper/OrderMapper.xml new file mode 100644 index 0000000..34558c1 --- /dev/null +++ b/VamPa_MySQL/target/classes/com/vam/mapper/OrderMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/VamPa_MySQL/target/m2e-wtp/web-resources/META-INF/maven/com.vam/controller/pom.properties b/VamPa_MySQL/target/m2e-wtp/web-resources/META-INF/maven/com.vam/controller/pom.properties index 87b0544..7b66ad6 100644 --- a/VamPa_MySQL/target/m2e-wtp/web-resources/META-INF/maven/com.vam/controller/pom.properties +++ b/VamPa_MySQL/target/m2e-wtp/web-resources/META-INF/maven/com.vam/controller/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven Integration for Eclipse -#Wed Dec 08 23:55:17 KST 2021 +#Thu Dec 09 15:29:52 KST 2021 m2e.projectLocation=C\:\\Users\\sjinj\\git\\Blog_Project2\\VamPa_MySQL m2e.projectName=VamPa_MySQL groupId=com.vam