diff --git a/project01/bin/main/order/res/logo.jpg b/project01/bin/main/order/res/logo.jpg new file mode 100644 index 0000000..364e80f Binary files /dev/null and b/project01/bin/main/order/res/logo.jpg differ diff --git a/project01/bin/main/order/res/logo2.jpg b/project01/bin/main/order/res/logo2.jpg new file mode 100644 index 0000000..7502567 Binary files /dev/null and b/project01/bin/main/order/res/logo2.jpg differ diff --git a/project01/bin/main/order/res/logo3.png b/project01/bin/main/order/res/logo3.png new file mode 100644 index 0000000..716c3bd Binary files /dev/null and b/project01/bin/main/order/res/logo3.png differ diff --git a/project01/src/main/manager/Get_order_list.java b/project01/src/main/manager/Get_order_list.java index b2e2515..d96a7b2 100644 --- a/project01/src/main/manager/Get_order_list.java +++ b/project01/src/main/manager/Get_order_list.java @@ -34,7 +34,7 @@ public String order_list() { ResultSet rs = pstmt.executeQuery(); while (rs.next()) { - result += (String.format("[%s] - 주문날짜 : %s, 주문 총액: %d\n%s\n\n", rs.getString("user_name"), rs.getString("order_date"), rs.getInt("payment"), rs.getString("user_order"))); + result += (String.format("[%s]\n주문날짜 : %s\n주문총액: %d\n[주문내역]\n%s\n\n", rs.getString("user_name"), rs.getString("order_date"), rs.getInt("payment"), rs.getString("user_order"))); } rs.close(); diff --git a/project01/src/main/manager/Modify_point_frame.java b/project01/src/main/manager/Modify_point_frame.java index c3d9ab0..c9b8637 100644 --- a/project01/src/main/manager/Modify_point_frame.java +++ b/project01/src/main/manager/Modify_point_frame.java @@ -16,6 +16,9 @@ import javax.swing.SwingConstants; import javax.swing.border.LineBorder; + +import main.LookupPoint; + import javax.swing.JTextField; @@ -165,6 +168,8 @@ public void mouseClicked(MouseEvent e) { } else if (overlap == null) { JOptionPane.showMessageDialog(null, "존재하지 않는 사용자입니다."); + } else if (new LookupPoint().point(id.getText()) < Integer.parseInt(point.getText())) { + JOptionPane.showMessageDialog(null, "차감할 포인트가 기존 포인트보다 많습니다. 다시 입력해주세요."); } else if (point.getText().equals("") || Integer.parseInt(point.getText()) <= 0) { JOptionPane.showMessageDialog(null, "포인트를 정확히 입력해주세요."); }else { diff --git a/project01/src/main/order/OrderFrame.java b/project01/src/main/order/OrderFrame.java index 62bedaa..bddde35 100644 --- a/project01/src/main/order/OrderFrame.java +++ b/project01/src/main/order/OrderFrame.java @@ -2,6 +2,7 @@ import java.awt.Color; import java.awt.Cursor; +import java.awt.EventQueue; import java.awt.Font; import java.awt.Image; import java.awt.event.MouseAdapter; @@ -25,7 +26,7 @@ public class OrderFrame extends JFrame { int usedPoint = 0; private Image img_logo = new ImageIcon(OrderFrame.class.getResource("res/logo3.png")).getImage().getScaledInstance(100, 100, Image.SCALE_SMOOTH); private JPanel contentPane; - + public OrderFrame(String id) { int point = new LookupPoint().point(id); setUndecorated(true); diff --git a/project01/src/main/order/res/logo.jpg b/project01/src/main/order/res/logo.jpg new file mode 100644 index 0000000..364e80f Binary files /dev/null and b/project01/src/main/order/res/logo.jpg differ diff --git a/project01/src/main/order/res/logo2.jpg b/project01/src/main/order/res/logo2.jpg new file mode 100644 index 0000000..7502567 Binary files /dev/null and b/project01/src/main/order/res/logo2.jpg differ diff --git a/project01/src/main/order/res/logo3.png b/project01/src/main/order/res/logo3.png new file mode 100644 index 0000000..716c3bd Binary files /dev/null and b/project01/src/main/order/res/logo3.png differ