From c52ff8c0e9455002ffdb39ac4a6ca48d2297997a Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Sun, 26 Mar 2023 22:02:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/entities/indentItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/entities/indentItem.java b/src/main/java/entities/indentItem.java index a4b12a2..f758ecd 100644 --- a/src/main/java/entities/indentItem.java +++ b/src/main/java/entities/indentItem.java @@ -8,4 +8,4 @@ public class indentItem { private String name;//菜品名字 private Float price;//菜品价格 private String description;//菜品描述 -} +} \ No newline at end of file From 2b19fc6f6207515d6207938bf476d646a9f3105b Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Sun, 26 Mar 2023 22:03:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=BF=BD=E7=95=A5=E6=8F=90=E4=BA=A4.idea?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/entities/Indent.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/entities/Indent.java b/src/main/java/entities/Indent.java index 75cd81b..bf4e63f 100644 --- a/src/main/java/entities/Indent.java +++ b/src/main/java/entities/Indent.java @@ -10,5 +10,4 @@ public class Indent { private Users userID;//外键，下单用户ID private Merchants merchantsID;//外键，餐厅ID private Float allPrice;//菜品总价 - } From 2023f3b1be42e9f2513e4757787898b9381011ce Mon Sep 17 00:00:00 2001 From: twinkle255 Date: Sun, 26 Mar 2023 22:13:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E3=80=82=E5=8F=A6=E5=A4=96=E4=B8=BA=E5=95=A5=E8=BF=99?= =?UTF-8?q?=E4=B8=AA.idea=E6=96=87=E4=BB=B6=E9=9A=90=E8=97=8F=E4=BA=86?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E4=BC=9A=E8=A2=AB=E6=8F=90=E4=BA=A4=E5=88=B0?= =?UTF-8?q?git=E4=B8=8A=E9=9D=A2=E5=98=9E=EF=BC=8C=E7=9C=9F=E7=8E=84?= =?UTF-8?q?=E5=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/entities/Merchants.java | 3 +-- src/main/java/entities/Users.java | 2 +- src/main/java/entities/indentItem.java | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/entities/Merchants.java b/src/main/java/entities/Merchants.java index 750d86a..e895b21 100644 --- a/src/main/java/entities/Merchants.java +++ b/src/main/java/entities/Merchants.java @@ -8,7 +8,6 @@ public class Merchants { private Long id;//商家编号 private String name;//店铺名字 private String address;//店铺地址 + private String description;//店铺描述 private Indent IndentID;//外键，订单ID - - } diff --git a/src/main/java/entities/Users.java b/src/main/java/entities/Users.java index 4d1d91f..ce8d221 100644 --- a/src/main/java/entities/Users.java +++ b/src/main/java/entities/Users.java @@ -5,7 +5,7 @@ import lombok.Data; //用户类 @Data public class Users { - private Long id; + private Long id;//用户ID private String name;//用户姓名 private String phoneNumber;//用户联系方式 private String address;//家庭住址 diff --git a/src/main/java/entities/indentItem.java b/src/main/java/entities/indentItem.java index f758ecd..d8f1dce 100644 --- a/src/main/java/entities/indentItem.java +++ b/src/main/java/entities/indentItem.java @@ -6,6 +6,9 @@ import lombok.Data; public class indentItem { private Long id;//菜品ID private String name;//菜品名字 - private Float price;//菜品价格 + private Float initialPrice;//菜品原价 + private Float discount;//折扣 + private Float finalPrice;//最终价格 private String description;//菜品描述 + } \ No newline at end of file