From 52c3c4fd5028c7dc7d710687b82c72400a55985d Mon Sep 17 00:00:00 2001
From: twinkle255 <white2021@foxmail.com>
Date: Sun, 25 Jun 2023 12:01:53 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=20merge=20remote=E4=BA=86=E4=BB=A5?=
 =?UTF-8?q?=E5=90=8E=E5=87=BA=E7=8E=B0=E4=BA=86=E7=8E=84=E5=AD=A6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=9C=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JDBC/src/main/java/view/IndentItemView.java | 44 ++++++---------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/JDBC/src/main/java/view/IndentItemView.java b/JDBC/src/main/java/view/IndentItemView.java
index f95561c..aa131f8 100644
--- a/JDBC/src/main/java/view/IndentItemView.java
+++ b/JDBC/src/main/java/view/IndentItemView.java
@@ -30,38 +30,20 @@ public class IndentItemView {
         int flag = 0;
         while (!reader.hasNext("end")) {
             IndentItem IItem = new IndentItem();
-            String s;
-            String[] sn;
-            while (!reader.hasNext("end")) {
-                s = reader.nextLine();
-                sn = s.split("\\s+");
-                //菜名
-                IItem.setName(sn[0]);
-                //初始价格
-                IItem.setInitialPrice(Float.valueOf(sn[1]));
-                //折扣
-                if (sn[3] != null) {
-                    IItem.setDiscount(Float.valueOf(sn[2]));
-                } else {
-                    IItem.setDiscount(-1F);
-                }
-                //描述
-                if (sn[3] != null) {
-                    IItem.setDescription(sn[3]);
-                }
+            //菜名
+            IItem.setName(reader.next());
+            //初始价格
+            IItem.setInitialPrice(reader.nextFloat());
+            //折扣
+            if (reader.hasNextFloat()) {
+                IItem.setDiscount(reader.nextFloat());
+            } else {
+                IItem.setDiscount(-1F);
+            }
+            //描述
+            if (!reader.hasNext("end") && !Objects.equals(reader.nextLine(), " ")) {
+                IItem.setDescription(reader.nextLine());
             }
-//            IItem.setName(reader.next());
-//            IItem.setInitialPrice(reader.nextFloat());
-
-//            if (reader.hasNextFloat()) {
-//                IItem.setDiscount(reader.nextFloat());
-//            } else {
-//                IItem.setDiscount(-1F);
-//            }
-
-//            if (!reader.hasNext("end") && !Objects.equals(reader.nextLine(), " ")) {
-//                IItem.setDescription(reader.nextLine());
-//            }
             //菜单ID
             indentDAO indent = new indentDAO();
             IItem.setIndentID(indent.searchID(indentID));