Merge pull request #178 from in27sung/admin_hyeon

admin 파트 수정으로 인한 커밋
in27sung · Dec 17, 2024 · dce96f5 · dce96f5
2 parents 5a29360 + d6c6c68
commit dce96f5
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 0 deletions.
diff --git a/stockMate/src/main/java/com/stockm8/service/OrderServiceImpl.java b/stockMate/src/main/java/com/stockm8/service/OrderServiceImpl.java
@@ -46,6 +46,8 @@ public void insertOrderWithItems(OrderVO order, List<OrderItemVO> orderItems) th
         }
     	odao.insertOrderItem(orderItems);
     	processOrderByType(order);
+
+    	rdao.insertReceiving(businessId);
 	}
 
 

diff --git a/stockMate/src/main/webapp/WEB-INF/views/admin/adminMain.jsp b/stockMate/src/main/webapp/WEB-INF/views/admin/adminMain.jsp
@@ -5,11 +5,63 @@
 <head>
 <meta charset="UTF-8">
 <title>관리자 메인</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 0;
+            padding: 0;
+            background-color: #f9f9f9;
+            text-align: center;
+        }
+        h1 {
+            margin-top: 30px;
+        }
+        .container {
+            margin-top: 50px;
+        }
+        button {
+            width: 250px;
+            height: 50px;
+            margin: 10px;
+            background-color: black;
+            color: white;
+            border: none;
+            cursor: pointer;
+            font-size: 16px;
+        }
+        button:hover {
+            background-color: #444;
+        }
+        footer {
+            margin-top: 50px;
+            background-color: #333;
+            color: white;
+            padding: 10px 0;
+        }
+    </style>
 
 
 </head>
 <body>
 	<h1>관리자 메인</h1>
 
+	<!-- 버튼 영역 -->
+    <div class="container">
+        <form action="adminMemberEdit.jsp" method="post">
+            <button type="submit">회원 수정 및 삭제</button>
+        </form>
+        <form action="adminMemberList.jsp" method="get">
+            <button type="submit">회원 전체 목록 조회</button>
+        </form>
+        <form action="adminRegistrationApproval.jsp" method="post">
+            <button type="submit">회원가입 승인</button>
+        </form>
+    </div>
+
+    <!-- 푸터 -->
+    <footer>
+        <p>회사 정보 - 사업자 번호, 연락처 등등 푸터 내용</p>
+    </footer>
+
 </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         	odao.insertOrderItem(orderItems);
         	processOrderByType(order);
+        	rdao.insertReceiving(businessId);
     	}
@@ Expand Down @@